Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/merge.py @ 48722: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 9bc86adf32f6
comparison
equal deleted inserted replaced
48721:48aff31e7f4c 48722:25d5dffbb211
486 b'remote path conflict', 486 b'remote path conflict',
487 ) 487 )
488 mresult.addfile( 488 mresult.addfile(
489 p, 489 p,
490 mergestatemod.ACTION_PATH_CONFLICT, 490 mergestatemod.ACTION_PATH_CONFLICT,
491 (pnew, mergestatemod.ACTION_REMOVE), 491 (pnew, b'r'),
492 b'path conflict', 492 b'path conflict',
493 ) 493 )
494 remoteconflicts.remove(p) 494 remoteconflicts.remove(p)
495 break 495 break
496 496