tests/test-conflict.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 20 Feb 2006 19:04:56 +0100
changeset 1755 a8f7791e3680
parent 925 5a034646e472
child 1933 7544700fd931
permissions -rw-r--r--
add 'debugrebuildstate' to rebuild the dirstate from a given revision - added and removed files will be lost while recreating the dirstate - modifications are not lost

merge: warning: conflicts during merge
merging a
merging a failed!
32e80765d7fe+75234512624c+ tip
something else
=======
something
M a