Mercurial > public > mercurial-scm > hg

comparison mercurial/simplemerge.py @ 28070:a504794cee29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: add some useful documentation
author Ryan McElroy <rmcelroy@fb.com>
date Tue, 09 Feb 2016 15:25:09 -0800
parents ef1eb6df7071
children 261324dd5f5b
comparison
equal deleted inserted replaced
28069:b2d24c2898f9 28070:a504794cee29
193 b and a are different from base but give the same result 193 b and a are different from base but give the same result
194 194
195 'a', start, end 195 'a', start, end
196 Non-clashing insertion from a[start:end] 196 Non-clashing insertion from a[start:end]
197 197
198 'conflict', zstart, zend, astart, aend, bstart, bend
199 Conflict between a and b, with z as common ancestor
200
198 Method is as follows: 201 Method is as follows:
199 202
200 The two sequences align only on regions which match the base 203 The two sequences align only on regions which match the base
201 and both descendants. These are found by doing a two-way diff 204 and both descendants. These are found by doing a two-way diff
202 of each one against the base, and then finding the 205 of each one against the base, and then finding the