[Updated] D12111: merge: stop using merge action for pathconflict option

[marmoute (Pierre-Yves David)]

Closed by commit rHG25d5dffbb211: merge: stop using merge action for pathconflict option (authored by marmoute).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D12111?vs=32007&id=32069

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D12111/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D12111

AFFECTED FILES
  mercurial/merge.py

CHANGE DETAILS

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -488,7 +488,7 @@
                 mresult.addfile(
                     p,
                     mergestatemod.ACTION_PATH_CONFLICT,
-                    (pnew, mergestatemod.ACTION_REMOVE),
+                    (pnew, b'r'),
                     b'path conflict',
                 )
                 remoteconflicts.remove(p)



To: marmoute, #hg-reviewers, Alphare
Cc: Alphare, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20220204/36669369/attachment-0002.html>