tests/test-merge5.out
author Bryan O'Sullivan <bos@serpentine.com>
Tue, 08 May 2007 12:20:13 -0700
changeset 4420 b0656b33cc02
parent 3592 fffc8a733bf9
permissions -rw-r--r--
add test for patchbomb extension.

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