Mercurial > hg

comparison tests/test-commit-unresolved.t @ 34553:0217d66846f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: improve error messages for path conflicts during update Differential Revision: https://phab.mercurial-scm.org/D782
author Mark Thomas <mbthomas@fb.com>
date Mon, 02 Oct 2017 14:05:30 -0700
parents c15f06109b7a
children 41ef02ba329b
comparison
equal deleted inserted replaced
34552:33c8a6837181 34553:0217d66846f7