tests/test-merge2.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Sat, 25 Aug 2007 11:30:11 +0200
changeset 5224 9cd6578750b9
parent 2175 b2ae81a7df29
permissions -rw-r--r--
improve error message for 'hg merge' when repo already at branchtip

0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b