X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/79df2f0df89f382b63e4122aa15099a257a06463..f7ed76a9b6158888e8efe2faef9c095802fd93fe:/examples/gitconfig?ds=sidebyside

diff --git a/examples/gitconfig b/examples/gitconfig
index 0c0555a..5e7b240 100644
--- a/examples/gitconfig
+++ b/examples/gitconfig
@@ -50,6 +50,9 @@
 	#imerger = emacs --eval '(ediff-merge-files-with-ancestor \
 	#	"%(branch1)s" "%(branch2)s" "%(ancestor)s" nil "%(output)s")'
 
+	# Automatically invoke the interactive merger in case of conflicts
+	#autoimerge = no
+
 	# Leave the original files in the working tree in case of a
 	# merge conflict
 	#keeporig = yes