view tests/test-merge5.out @ 4048:5d6b3fa62736

mq: Mention usage of hg add/remove/copy/rename in qrefresh help text.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 29 Jan 2007 17:33:09 +0100
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