Mercurial > hg

changeset 48708:25d5dffbb211

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: stop using merge action for pathconflict option This is not the b'r' you are looking for. Differential Revision: https://phab.mercurial-scm.org/D12111
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 28 Jan 2022 16:41:45 +0100
parents 48aff31e7f4c
children d536d4afe003
files mercurial/merge.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Fri Jan 28 14:25:51 2022 +0100
+++ b/mercurial/merge.py	Fri Jan 28 16:41:45 2022 +0100
@@ -488,7 +488,7 @@
                 mresult.addfile(
                     p,
                     mergestatemod.ACTION_PATH_CONFLICT,
-                    (pnew, mergestatemod.ACTION_REMOVE),
+                    (pnew, b'r'),
                     b'path conflict',
                 )
                 remoteconflicts.remove(p)