tests/test-merge5.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Fri, 11 Nov 2005 15:33:08 -0800
changeset 1527 c13fce7167c2
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
don't print anything about file of unsupported type unless the file was specified on the command line

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)