tests/test-merge4.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Sat, 02 Sep 2006 21:08:54 +0200
changeset 3034 2b0bc36a48d8
parent 2175 b2ae81a7df29
child 6336 4b0c9c674707
permissions -rw-r--r--
sshrepo: flush stderr before connecting to the hg server

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)