view tests/test-merge5.out @ 4133:a9ee6c53af8d

mq: abort cleanly when invalid patch name is given to qguard
author Christian Ebert <blacktrash@gmx.net>
date Sat, 03 Mar 2007 17:54:13 +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