tests/test-merge4.out
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 17 May 2006 19:58:22 +0200
changeset 2302 506fcf779cae
parent 2175 b2ae81a7df29
permissions -rw-r--r--
Corrected test for date in output of 'hg export'.

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)