~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c8a4777) | patch
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)
commitd7fade4be437ade1eaf92ca29cc99b566b0e3c18
tree47a8db1cdac99df473b5904bde23151cc7af1947tree | snapshot (tar.gz zip)
parentc8a4777f93c66181a78c25d292be3681ecf3adaacommit | diff
Allow configurable file extensions for merge conflicts

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>
examples/stgitrc diff | blob | blame | history
stgit/commands/common.py diff | blob | blame | history
stgit/commands/resolved.py diff | blob | blame | history
stgit/config.py diff | blob | blame | history
stgit/gitmergeonefile.py diff | blob | blame | history
GIT patch-maintenance porcelain (local modifications)