# HG changeset patch
# User Ryan McElroy <rmcelroy@fb.com>
# Date 2016-02-09 23:25:09
# Node ID a504794cee297e8753ea20ab576937ceb35dc43c
# Parent  b2d24c2898f91c891425c204d4f8e683d8120372

merge: add some useful documentation

diff --git a/mercurial/simplemerge.py b/mercurial/simplemerge.py
--- a/mercurial/simplemerge.py
+++ b/mercurial/simplemerge.py
@@ -195,6 +195,9 @@ class Merge3Text(object):
         'a', start, end
              Non-clashing insertion from a[start:end]
 
+        'conflict', zstart, zend, astart, aend, bstart, bend
+            Conflict between a and b, with z as common ancestor
+
         Method is as follows:
 
         The two sequences align only on regions which match the base