tests/test-merge4.out
author Matt Mackall <mpm@selenic.com>
Sun, 03 Dec 2006 16:16:33 -0600
changeset 3773 b1eeaeb936ae
parent 2175 b2ae81a7df29
child 6336 4b0c9c674707
permissions -rw-r--r--
Handle transcoding of branch names

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