annotate tests/test-locale.t @ 48516:59524cb1cd73

simplemerge: don't calculate conflict labels when resolving automatically Differential Revision: https://phab.mercurial-scm.org/D11903
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 07 Dec 2021 23:01:20 -0800
parents afcad425a0b6
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
44977
afcad425a0b6 pycompat: fix crash when default locale is unknown
Manuel Jacob <me@manueljacob.de>
parents:
diff changeset
1 $ LANG=nonexistent LC_ALL=nonexistent LANGUAGE=nonexistent hg version -q
afcad425a0b6 pycompat: fix crash when default locale is unknown
Manuel Jacob <me@manueljacob.de>
parents:
diff changeset
2 Mercurial Distributed SCM (version *) (glob)