comparison mercurial/obsutil.py @ 48708:25d5dffbb211

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 fff5942d445f
children 6000f5b25c9b
comparison
equal deleted inserted replaced
48707:48aff31e7f4c 48708:25d5dffbb211