chiark / gitweb /
~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 82021e1) | patch
Add an interractive 2-way merge option
authorCatalin Marinas <catalin.marinas@gmail.com>
Wed, 28 Feb 2007 08:41:56 +0000 (08:41 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Wed, 28 Feb 2007 08:41:56 +0000 (08:41 +0000)
commitb6e961f27081bdb876f1caabfb9500f36ac7ac7f
tree9ddd7910dcfd183e6c951b30e793459b71b486cctree | snapshot
parent82021e1e735c1ec92b41b3b5aca9f2ce1551e287commit | diff
Add an interractive 2-way merge option

Since emacs can handle 2-way merges as well with ediff-merge-files,
this patch changes the 'imerger' config option to 'i3merge' and also
adds an 'i2merge' option. The gitmergeonefile.py algorithm was
modified to handle 2-way merges interactively as well.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
examples/gitconfig diff | blob | blame | history
stgit/gitmergeonefile.py diff | blob | blame | history
GIT patch-maintenance porcelain (local modifications)