comparison tests/test-ui-color.py.out @ 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 842a9179132c
children b8c2004a8d2b
comparison
equal deleted inserted replaced
34552:33c8a6837181 34553:0217d66846f7