tests/test-merge4.out
author Martin Geisler <mg@lazybytes.net>
Tue, 23 Jun 2009 23:05:51 +0200
changeset 8928 1e16f9b21ce4
parent 6336 4b0c9c674707
permissions -rw-r--r--
test-globalopts: broken by output change in 62e3b9466700

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)