tests/test-merge4.out
author Matt Mackall <mpm@selenic.com>
Thu, 08 Oct 2009 01:17:48 -0500
changeset 9571 7e03423def3c
parent 6336 4b0c9c674707
permissions -rw-r--r--
merge with stable

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)