| commit | 5b99888bc11c6ac2c3c940c3c9bb4b9905225754 | |
| author | Catalin Marinas <catalin.marinas@gmail.com> | |
| Mon, 20 Nov 2006 21:45:17 +0000 (20 21:45 +0000) | ||
| committer | Catalin Marinas <catalin.marinas@gmail.com> | |
| Mon, 20 Nov 2006 21:45:17 +0000 (20 21:45 +0000) | ||
| tree | b27be1cd083e07b2789f28000cb6721c43efc7f8 | treesnapshot (tar.gz zip) |
| parent | eee7283e896c65fbd86d5449886515dec6b7449c | commitdiff |
Fix a bug in gitmergeonefile.py introduced recently
The bug was introduced by the change of merger and keeporig variables
from string to ConfigOption.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
The bug was introduced by the change of merger and keeporig variables
from string to ConfigOption.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
| stgit/gitmergeonefile.py | diffblobblamehistory |