# HG changeset patch
# User Ryan McElroy <rmcelroy@fb.com>
# Date 1455060309 28800
# Node ID a504794cee297e8753ea20ab576937ceb35dc43c
# Parent  b2d24c2898f91c891425c204d4f8e683d8120372
merge: add some useful documentation

diff -r b2d24c2898f9 -r a504794cee29 mercurial/simplemerge.py
--- a/mercurial/simplemerge.py	Sun Dec 27 19:58:11 2015 +0900
+++ b/mercurial/simplemerge.py	Tue Feb 09 15:25:09 2016 -0800
@@ -195,6 +195,9 @@
         '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