Mercurial > hg

diff tests/test-merge-local.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 9e4f82bc2b0b
children 55c6ebd11cb9
line wrap: on
line diff