Merge lp:~markgius/bzr-extmerge/git-mergetool-support into lp:~zindar/bzr-extmerge/trunk

[Mark Gius]

Adds accepted configuration for git-mergetool style merging.

Adds accepted configuration for git-mergetool style merging.

Left is local committed copy, middle is merged copy with markers, right is remote copy. This config works extremely well with vimdiff.

[Jelmer Vernooij (jelmer)]

Looks reasonable to me (though I'm not a bzr-extmerge maintainer)

review: Approve (code)

[Fred McCann (xred)]

We've already accepted a proposal that covers this use case; ("%t", "%r", "%o") will be available in the next release.

review: Disapprove

Unmerged revisions

17. By Mark Gius on 2011-06-03

Add config for git-mergetool style merges

=== modified file 'extmerge.py'
--- extmerge.py	2010-07-28 14:16:55 +0000
+++ extmerge.py	2011-06-03 18:01:45 +0000
@@ -35,7 +35,10 @@
     # meld-style 3 way merge, one file (%T) being used for both in- and output
     ('%b', '%T', '%o'),
     # meld-style 2 way merge, one file (%T) being used for both in- and output
-    ('%T', '%o')
+    ('%T', '%o'),
+    # git mergetool style merge
+    ('%t', '%r', '%o'),
+
 )
 
 mergetools = [