Patchwork [5,of,6,V2] internal:merge: update documentation

login
register
mail settings
Submitter Pierre-Yves David
Date Aug. 5, 2014, 11:30 p.m.
Message ID <0c3bb100f3a682832b1b.1407281445@marginatus.alto.octopoid.net>
Download mbox | patch
Permalink /patch/5272/
State Accepted
Headers show

Comments

Pierre-Yves David - Aug. 5, 2014, 11:30 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1407276594 25200
#      Tue Aug 05 15:09:54 2014 -0700
# Node ID 0c3bb100f3a682832b1b44b97e3402d9e1963360
# Parent  ecfd2f513564593a31a8859fa1aa5e7fa5d69bcf
internal:merge: update documentation

Highlight the fact their is two regions in the markers and what their contents
are. This prepare the arrival of merge:3

Patch

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -204,11 +204,12 @@  def _premerge(repo, toolconf, files, lab
                 "(edit conflicts, then use 'hg resolve --mark')\n"))
 def _imerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
     """
     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 '
                        'for %s\n') % fcd.path())
         return False, 1