tests/test-merge5.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 25 Oct 2005 15:51:28 -0700
changeset 1447 508a3f559553
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
revert added and removed files to their normal state before reverting add a test for revert

removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use update -m to merge across branches or -C to lose changes)