tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Sun, 03 Dec 2006 16:16:33 -0600
changeset 3778 5da370c2f72d
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Add a charset encoding test case

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes