view tests/test-merge5.out @ 5354:4fbd27bf04b1

convert: fail properly if we can't read a source hg repository
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 02 Oct 2007 13:48:52 -0700
parents fffc8a733bf9
children
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