# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1643384505 -3600
# Node ID 25d5dffbb21102acccdc1b0d08740af993f0a002
# Parent  48aff31e7f4c942ffa9a297fe0dfefb3f34d061f
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

diff -r 48aff31e7f4c -r 25d5dffbb211 mercurial/merge.py
--- 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)