annotate tests/test-issue433.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 199dcb97a5b6
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3719
199dcb97a5b6 add test for issue433
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
1 adding a
199dcb97a5b6 add test for issue433
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
2 abort: 'doesnotexist' not found in manifest!