view tests/test-cat.out @ 5204:6a1d2dd96b8e

abort when adding a file in merged state
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 21 Aug 2007 02:02:08 +0200
parents 7544700fd931
children
line wrap: on
line source

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