# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 2014-08-05 22:09:54
# Node ID b98e5c7afc70383a2f433a74a1813f7114ae0408
# Parent  6966542768ff38ad864315d598aebc6ef65e5da8

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.

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -206,7 +206,8 @@ def _imerge(repo, mynode, orig, fcd, fco
     """
     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 '