Mercurial > hg
annotate tests/test-locale.t @ 48584:74973a6d4e67
filemerge: always define a "base" label
It simplifies the code and improves the conflict markers to always
have the "base" label defined.
Differential Revision: https://phab.mercurial-scm.org/D12016
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 20 Jan 2022 14:13:12 -0800 |
parents | afcad425a0b6 |
children |
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) |