Mercurial > hg

diff doc/hgrc.5.txt @ 11146:523330d567cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: tool.premerge=keep will leave premerge markers in $local
author David Champion <dgc@uchicago.edu>
date Wed, 21 Apr 2010 11:57:45 -0500
parents b3a1f535ce4f
children a912f26777d3
line wrap: on
line diff
--- a/doc/hgrc.5.txt	Tue May 11 20:22:37 2010 +0200
+++ b/doc/hgrc.5.txt	Wed Apr 21 11:57:45 2010 -0500
@@ -454,7 +454,8 @@
   Default: ``$local $base $other``
 ``premerge``
   Attempt to run internal non-interactive 3-way merge tool before
-  launching external tool.
+  launching external tool.  Options are ``true``, ``false``, or ``keep``
+  to leave markers in the file if the premerge fails.
   Default: True
 ``binary``
   This tool can merge binary files. Defaults to False, unless tool