view tests/test-status-inprocess.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 07dbafd3a0e2
children
line wrap: on
line source

% creating repo
% add and commit
C test.py
% change
M test.py