tests/test-merge4.out
author Matt Mackall <mpm@selenic.com>
Sat, 20 Jun 2009 09:00:02 -0500
changeset 8856 f8d00346a62d
parent 6336 4b0c9c674707
permissions -rw-r--r--
rollback: minor clarification (issue828)

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)