changeset 28070 | a504794cee29 |
parent 26614 | ef1eb6df7071 |
child 28071 | 261324dd5f5b |
--- 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