Mercurial > public > mercurial-scm > hg

diff 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
line wrap: on
line diff
--- a/mercurial/simplemerge.py	Fri Jan 13 00:07:07 2023 +0100
+++ b/mercurial/simplemerge.py	Thu Jan 26 00:23:07 2023 +0100
@@ -512,6 +512,8 @@
     conflicts = False
     if mode == b'union':
         lines = _resolve(m3, (1, 2))
+    elif mode == b'union-other-first':
+        lines = _resolve(m3, (2, 1))
     elif mode == b'local':
         lines = _resolve(m3, (1,))
     elif mode == b'other':