Mercurial > public > mercurial-scm > hg-stable

diff relnotes/next @ 50018: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 18282cf18aa2
children 8a65b43457ab
line wrap: on
line diff
--- a/relnotes/next	Fri Jan 13 00:07:07 2023 +0100
+++ b/relnotes/next	Thu Jan 26 00:23:07 2023 +0100
@@ -2,6 +2,9 @@
 
 == New Features ==
 
+ * There is a new internal merge tool called `internal:union-other-first`.
+   It works like `internal:union` but add other side on top of local.
+
 == Default Format Change ==
 
 These changes affect newly created repositories (or new clones) done with