comparison mercurial/mergeutil.py @ 48353:8960295b9246

rhg: only complain about poorly configured fallback when falling back Differential Revision: https://phab.mercurial-scm.org/D11751
author Arseniy Alekseyev <aalekseyev@janestreet.com>
date Thu, 11 Nov 2021 14:26:25 +0000
parents d4ba4d51f85f
children 6000f5b25c9b
comparison
equal deleted inserted replaced
48352:a71a2f72f5d8 48353:8960295b9246