tests/test-manifest.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Sat, 25 Aug 2007 11:30:11 +0200
changeset 5224 9cd6578750b9
parent 5138 13d23d66a6cd
child 5405 8feb33c2d153
permissions -rw-r--r--
improve error message for 'hg merge' when repo already at branchtip

adding a
adding b/a
a
b/a
644 a
644 b/a
b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a
b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 b/a
a
a
b/a
a
b/a
% should fail
abort: unknown revision '2'!
abort: please specify just one revision
a
b/a