tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Sun, 17 Dec 2006 14:56:12 -0600
changeset 3921 6d0d025e125a
parent 3592 fffc8a733bf9
permissions -rw-r--r--
demandimport: fix import x.y.z as a when x.y is already imported.

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