~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add option to automatically invoke the interactive merger
[stgit]
/
examples
/
gitconfig
diff --git
a/examples/gitconfig
b/examples/gitconfig
index
0c0555a
..
5e7b240
100644
(file)
--- 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")'
#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
# Leave the original files in the working tree in case of a
# merge conflict
#keeporig = yes