diff tests/test-revlog-ancestry.py @ 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 d83ca854fa21
children 14d2371216ba
line wrap: on
line diff