tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Thu, 30 Nov 2006 17:36:33 -0600
changeset 3732 ffe9fef84801
parent 3592 fffc8a733bf9
permissions -rw-r--r--
merge: pull findcopies helpers inside, refactor checkpair to checkcopies

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