tests/test-merge2.out
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 21 Dec 2007 21:50:19 +0100
changeset 5685 57d29a45ffbc
parent 2175 b2ae81a7df29
child 6336 4b0c9c674707
permissions -rw-r--r--
Use skipped: instead of hghave: for skipping tests, use this in test-merge-types

0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b