Mercurial Mercurial > mercurial / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-locale.t
author Martin von Zweigbergk <martinvonz@google.com>
Fri, 14 Jan 2022 08:17:13 -0800
changeset 48755 6ae3c97a0919
parent 44977 afcad425a0b6
permissions -rw-r--r--
simplemerge: move printing of merge result to extension The `mercurial.simplemerge` module still has some command-lines processing that doesn't belong in such a low-level module. This patch moves the handling of `hg simplemerge --print` to the extension by having `mercurial.simplemerge.simplemerge()` return the merged text. Differential Revision: https://phab.mercurial-scm.org/D12148
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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)
mercurial