diff tests/test-hgweb-annotate-whitespace.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 f6492f482c60
children 3b4b38130689
line wrap: on
line diff