tests/test-merge4.out
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 18 Oct 2006 12:17:02 +0200
changeset 3454 0600d326d96a
parent 2175 b2ae81a7df29
permissions -rw-r--r--
Adjust default cmdline style to really match verbose/debug log.

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)