Mercurial > hg
diff mercurial/cmdutil.py @ 40029:e2697acd9381
cleanup: some Yoda conditions, this patch removes
It seems the factor 20 is less than the frequency of " < \d" compared
to " \d > ".
Differential Revision: https://phab.mercurial-scm.org/D4862
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 03 Oct 2018 10:27:44 -0700 |
| parents | 0d703063d0c8 |
| children | 1d09ba0d2ed3 |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Tue Oct 02 12:43:54 2018 -0700 +++ b/mercurial/cmdutil.py Wed Oct 03 10:27:44 2018 -0700 @@ -861,7 +861,7 @@ if isinstance(ctxorbool, bool): if ctxorbool: return baseformname + ".merge" - elif 1 < len(ctxorbool.parents()): + elif len(ctxorbool.parents()) > 1: return baseformname + ".merge" return baseformname + ".normal"