view tests/test-cat.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 f5b00b6e426a
children a4fbbe0fbc38
line wrap: on
line source

adding a
adding b
0
0
0
0
a: No such file in rev 03f6b0774996
1