diff tests/test-dirstate-nonnormalset.t @ 34553:0217d66846f7

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 127cc7f78475
children ed84a4d48910
line wrap: on
line diff