view tests/test-merge5.out @ 4887:2f09df302f30

patchbomb: add --desc, to specify a file containing a series description
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 16 Jul 2007 14:43:47 -0700
parents fffc8a733bf9
children 4b0c9c674707
line wrap: on
line source

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