Mercurial > public > mercurial-scm > hg

diff contrib/mergetools.hgrc @ 21632:3191d330302f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergetools.hgrc: add minimal configuration for editmerge The ``editmerge`` script is shipped in contrib and opens an editor on every conflicting file. It needs minimal configuration to inject the config marker in the file before opening. Otherwise it behaves the same as ``internal:local`` and bad things happen.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 29 May 2014 12:25:25 -0700
parents 12c7cea6235c
children 33020e87f8c5
line wrap: on
line diff
--- a/contrib/mergetools.hgrc	Thu May 29 15:41:16 2014 -0700
+++ b/contrib/mergetools.hgrc	Thu May 29 12:25:25 2014 -0700
@@ -71,6 +71,12 @@
 ecmerge.gui=True
 ecmerge.diffargs=$parent $child --mode=diff2 --title1='$plabel1' --title2='$clabel'
 
+# editmerge is a small script shipped in contrib.
+# It needs this config otherwise it behaves the same as internal:local
+editmerge.args=$output
+editmerge.check=changed
+editmerge.premerge=keep
+
 filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
 filemerge.args=-left $other -right $local -ancestor $base -merge $output
 filemerge.gui=True