view tests/test-revert-flags @ 7821:9fe7e6acf525

merge: better error messages to lead users to hg update --clean to abandon merges.

Fixes issue1533.

#!/bin/sh

"$TESTDIR/hghave" execbit || exit 80

hg init repo
cd repo
echo foo > foo
chmod 644 foo
hg ci -qAm '644'

chmod 755 foo
hg ci -qAm '755'

echo '% reverting to rev 0'
hg revert -a -r 0
hg st
hg diff --git