Mercurial > public > mercurial-scm > hg-stable

diff mercurial/help/config.txt @ 22032:d7f25834ffbb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge-tools: add a `premerge=keep-merge3` config option This value leaves premerge markers that includes the merge base too. This is a the same as what `internal:merge3` would do.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Mon, 04 Aug 2014 16:32:41 -0700
parents de5cee8ba088
children bc2132dfc0a4
line wrap: on
line diff
--- a/mercurial/help/config.txt	Mon Aug 04 16:58:39 2014 -0700
+++ b/mercurial/help/config.txt	Mon Aug 04 16:32:41 2014 -0700
@@ -954,8 +954,10 @@
 
 ``premerge``
   Attempt to run internal non-interactive 3-way merge tool before
-  launching external tool.  Options are ``true``, ``false``, or ``keep``
-  to leave markers in the file if the premerge fails.
+  launching external tool.  Options are ``true``, ``false``, ``keep`` or
+  ``keep-merge3``. The ``keep`` option will leave markers in the file if the
+  premerge fails. The ``keep-merge3`` will do the same but include information
+  about the base of the merge in the marker (see internal:merge3).
   Default: True
 
 ``binary``