diff mercurial/merge.py @ 43237:b21e3a747501

tests: fix formatting test after move of black config Differential Revision: https://phab.mercurial-scm.org/D7102
author Augie Fackler <augie@google.com>
date Tue, 15 Oct 2019 09:48:27 -0400
parents 8ff1ecfadcd1
children be384a2052aa
line wrap: on
line diff