comparison mercurial/mergeutil.py @ 43855:612951e08278

formatting: fix some recent formatting regressions Differential Revision: https://phab.mercurial-scm.org/D7605
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 11 Dec 2019 10:00:24 -0800
parents 8ff1ecfadcd1
children 32ce4cbaec4b
comparison
equal deleted inserted replaced
43847:49fa0b31ee1d 43855:612951e08278