tests/test-merge5.out
author Bryan O'Sullivan <bos@serpentine.com>
Tue, 12 Jun 2007 14:52:34 -0700
changeset 4564 087b3ae4f08a
parent 3592 fffc8a733bf9
permissions -rw-r--r--
patchbomb: add --date option

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