Mercurial > public > mercurial-scm > hg

comparison mercurial/simplemerge.py @ 49956:2282d8ac0fa9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: add union-other-first as internal merge tool See inline documentation for details.
author C?dric Krier <ced@b2ck.com>
date Thu, 26 Jan 2023 00:23:07 +0100
parents d44e3c45f0e4
children f4733654f144
comparison
equal deleted inserted replaced
49954:a11237723332 49956:2282d8ac0fa9
510 510
511 m3 = Merge3Text(base.text(), local.text(), other.text()) 511 m3 = Merge3Text(base.text(), local.text(), other.text())
512 conflicts = False 512 conflicts = False
513 if mode == b'union': 513 if mode == b'union':
514 lines = _resolve(m3, (1, 2)) 514 lines = _resolve(m3, (1, 2))
515 elif mode == b'union-other-first':
516 lines = _resolve(m3, (2, 1))
515 elif mode == b'local': 517 elif mode == b'local':
516 lines = _resolve(m3, (1,)) 518 lines = _resolve(m3, (1,))
517 elif mode == b'other': 519 elif mode == b'other':
518 lines = _resolve(m3, (2,)) 520 lines = _resolve(m3, (2,))
519 else: 521 else: