view tests/test-merge5.out @ 6083:81a8667331e8

convert: detect baz before tla The former seems to handle repositories built by the latter, the opposite is not true.
author Patrick Mezard <pmezard@gmail.com>
date Tue, 12 Feb 2008 23:35:35 +0100
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