tests/test-merge5.out
author John Goerzen <jgoerzen@complete.org>
Mon, 26 Mar 2007 20:46:49 -0500
changeset 4283 8625504f507c
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Slight refining to help text in patchbomb.py

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