tests/test-merge4.out
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 18 Oct 2006 18:10:21 +0200
changeset 3458 031aac7ec584
parent 2175 b2ae81a7df29
permissions -rw-r--r--
Extended templating test for new branches and extra changeset info.

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)