Re-add the interactive merge

[stgit] / examples / gitconfig

diff --git a/examples/gitconfig b/examples/gitconfig
index 52d2a696d5d0c004fa13c7327136f75f44655650..cd9b569d021d0de85ca1224fd11aec4ed0f802cc 100644 (file)
--- a/examples/gitconfig
+++ b/examples/gitconfig
@@ -60,13 +60,6 @@
        # To support local parent branches:
        #pull-policy = rebase
 
        # To support local parent branches:
        #pull-policy = rebase
 

-       # The three-way merge tool. Note that the 'output' file contains the
-       # same data as 'branch1'. This is useful for tools that do not take an
-       # output parameter
-       #merger = diff3 -L current -L ancestor -L patched -m -E \
-       #       \"%(branch1)s\" \"%(ancestor)s\" \"%(branch2)s\" \
-       #       > \"%(output)s\"
-

        # Interactive two/three-way merge tool. It is executed by the
        # 'resolved --interactive' command
        #i3merge = xxdiff --title1 current --title2 ancestor --title3 patched \
        # Interactive two/three-way merge tool. It is executed by the
        # 'resolved --interactive' command
        #i3merge = xxdiff --title1 current --title2 ancestor --title3 patched \