tests/test-merge4.out
author Martin Geisler <mg@daimi.au.dk>
Sat, 04 Apr 2009 18:31:01 +0200
changeset 7982 cab4a521a3fd
parent 6336 4b0c9c674707
permissions -rw-r--r--
commands: explain when to use resolve -m

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