# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1401391525 25200
# Node ID 3191d330302fb135f99d72fde26199db2776ca33
# Parent  9bafe09285f22661f13494a2037b7f0508523cfd
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.

diff -r 9bafe09285f2 -r 3191d330302f contrib/mergetools.hgrc
--- 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