view tests/test-merge5.out @ 6035:df659eb23360

convert: added GNU Arch source converter
author Aleix Conchillo Flaque <aleix@member.fsf.org>
date Tue, 05 Feb 2008 09:30:08 +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