view tests/test-up-issue1456.out @ 7821:9fe7e6acf525

merge: better error messages to lead users to hg update --clean to abandon merges. Fixes issue1533.
author Augie Fackler <durin42@gmail.com>
date Wed, 04 Mar 2009 13:06:16 -0600
parents a679bd371091
children f331de880cbb
line wrap: on
line source

dirty
M foo
% validate update of standalone execute bit change
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
nothing changed
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved