Mercurial > hg

changeset 22027:b98e5c7afc70

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
internal:merge: update documentation Highlight the fact there are two regions in the markers and what their contents are. This prepares for the arrival of merge3.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Tue, 05 Aug 2014 15:09:54 -0700
parents 6966542768ff
children 3d0572ab3b4a
files mercurial/filemerge.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/filemerge.py	Tue Aug 05 15:17:38 2014 -0700
+++ b/mercurial/filemerge.py	Tue Aug 05 15:09:54 2014 -0700
@@ -206,7 +206,8 @@
     """
     Uses the internal non-interactive simple merge algorithm for merging
     files. It will fail if there are any conflicts and leave markers in
-    the partially merged file."""
+    the partially merged file. Markers will have two sections, one for each side
+    of merge."""
     tool, toolpath, binary, symlink = toolconf
     if symlink:
         repo.ui.warn(_('warning: internal:merge cannot merge symlinks '