Mercurial > hg
comparison tests/test-conflict.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 | 96f43981c1c4 |
children | 41ef02ba329b |
comparison
equal
deleted
inserted
replaced
34552:33c8a6837181 | 34553:0217d66846f7 |
---|