Mercurial > hg
annotate tests/test-locale.t @ 46580:2076df13d00f
copies-rust: refactor the "deletion" case
We rearrange the code to single out the case where information need to be
overwritten on both side of the merge. This open the way to better dealing with
this case.
Differential Revision: https://phab.mercurial-scm.org/D9651
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Wed, 16 Dec 2020 10:59:00 +0100 |
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) |