~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: eee7283) | patch
Fix a bug in gitmergeonefile.py introduced recently
authorCatalin Marinas <catalin.marinas@gmail.com>
Mon, 20 Nov 2006 21:45:17 +0000 (21:45 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Mon, 20 Nov 2006 21:45:17 +0000 (21:45 +0000)
commit5b99888bc11c6ac2c3c940c3c9bb4b9905225754
treeb27be1cd083e07b2789f28000cb6721c43efc7f8tree | snapshot (tar.gz zip)
parenteee7283e896c65fbd86d5449886515dec6b7449ccommit | diff
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>
stgit/gitmergeonefile.py diff | blob | blame | history
GIT patch-maintenance porcelain (local modifications)