~mdw / stgit / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from: 5b99888)
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)
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>

No differences found
GIT patch-maintenance porcelain (local modifications)