tests/test-merge4.out
author Matt Mackall <mpm@selenic.com>
Mon, 04 May 2009 14:21:43 -0500
changeset 8298 9542f4c3fa1b
parent 6336 4b0c9c674707
permissions -rw-r--r--
config: make remap actually work

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)