view tests/test-revert-flags.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 d0dbae32517c
children
line wrap: on
line source

% reverting to rev 0
reverting foo
M foo
diff --git a/foo b/foo
old mode 100755
new mode 100644