tests/test-merge4.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Sun, 03 Sep 2006 02:28:39 +0200
changeset 3035 1efd5a6df5a3
parent 2175 b2ae81a7df29
permissions -rw-r--r--
do not enable verbose output if quiet is specified in the cmdline

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)