Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: add some useful documentation
authorRyan McElroy <rmcelroy@fb.com>
Tue, 09 Feb 2016 15:25:09 -0800
changeset 28070 a504794cee29
parent 28069 b2d24c2898f9
child 28071 261324dd5f5b
merge: add some useful documentation
mercurial/simplemerge.py file | annotate | diff | comparison | revisions 
--- 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
Mercurial