diff -r 6966542768ff -r b98e5c7afc70 mercurial/filemerge.py
--- 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 '