~mdw / stgit / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from: d7fade4)
Allow configurable file extensions for merge conflicts
authorCatalin Marinas <catalin.marinas@gmail.com>
Tue, 9 May 2006 20:21:28 +0000 (21:21 +0100)
committerCatalin Marinas <catalin.marinas@gmail.com>
Tue, 9 May 2006 20:21:28 +0000 (21:21 +0100)
The files left after a merge conflict had confusing extensions. This patch
adds the "extensions" config option and also sets the defaults to
".ancestor", ".current" and ".patched".

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>

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