Mercurial > hg

view tests/test-locale.t @ 45388:6ba7190ff863

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit: clear mergestate also with --amend (issue6304) The `hg commit --amend` uses the in-memory code, which naturally doesn't touch the merge state (well, it shouldn't anyway; I think I've fixed bugs in that area recently). We therefore need to clear the mergestate after calling `repo.commitctx()` since we expect that from `hg commit --amend`. Differential Revision: https://phab.mercurial-scm.org/D8932
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 18 Aug 2020 15:03:57 -0700
parents afcad425a0b6
children
line wrap: on
line source

  $ LANG=nonexistent LC_ALL=nonexistent LANGUAGE=nonexistent hg version -q
  Mercurial Distributed SCM (version *) (glob)