view tests/test-merge5.out @ 6195:272fd5fa576d

mq: remove unimplemented option -f for strip
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Fri, 29 Feb 2008 09:54:28 +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