diff mercurial/localrepo.py @ 48454:51f521900473

update: add a test for `--merge` overriding the "abort" config I don't see this behavior tested anywhere. Differential Revision: https://phab.mercurial-scm.org/D11850
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 03 Dec 2021 12:19:36 +0100
parents bf11ff22a9af
children f7086f6173f8 7964a2dbde12
line wrap: on
line diff