tests/test-revert-unknown.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 14 Dec 2005 22:19:03 -0600
changeset 1581 db10b7114de0
parent 1236 67a28636ea64
child 1620 6c61646fee5e
permissions -rw-r--r--
abort when merging two heads and repository has local changes

%% Should show unknown
? unknown
%% Should show unknown and b removed
R b
? unknown
%% Should show a and unknown
a
unknown