tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Fri, 22 Dec 2006 17:59:34 -0600
changeset 3954 fad134931327
parent 3592 fffc8a733bf9
permissions -rw-r--r--
convert-repo: add basic CVS import support

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