| commit | b6e961f27081bdb876f1caabfb9500f36ac7ac7f | |
| author | Catalin Marinas <catalin.marinas@gmail.com> | |
| Wed, 28 Feb 2007 08:41:56 +0000 (28 08:41 +0000) | ||
| committer | Catalin Marinas <catalin.marinas@gmail.com> | |
| Wed, 28 Feb 2007 08:41:56 +0000 (28 08:41 +0000) | ||
| tree | 9ddd7910dcfd183e6c951b30e793459b71b486cc | treesnapshot (tar.gz zip) |
| parent | 82021e1e735c1ec92b41b3b5aca9f2ce1551e287 | commitdiff |
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>
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 | diffblobblamehistory | |
| stgit/gitmergeonefile.py | diffblobblamehistory |