comparison tests/test-push-checkheads-superceed-A5.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 b11e8c67fb0f
children 4441705b7111
comparison
equal deleted inserted replaced
34552:33c8a6837181 34553:0217d66846f7