X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/blobdiff_plain/f1dd3ef7a91a5ad35045992cde02f183679b1cc9..29197bc02c1b5087017da9a86214e9b620f0439e:/examples/gitconfig

diff --git a/examples/gitconfig b/examples/gitconfig
index 52d2a69..cd9b569 100644
--- a/examples/gitconfig
+++ b/examples/gitconfig
@@ -60,13 +60,6 @@
 	# 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 \