view tests/test-merge2.out @ 3914:283ee8971570

doc string fix: hg cat and manifest default to current parent revision.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 16 Dec 2006 22:33:39 +0100
parents b2ae81a7df29
children 4b0c9c674707
line wrap: on
line source

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