view tests/test-merge5.out @ 4338:7ae02bce8de2

mq: fix qtop when some patches beneath are guarded
author Brendan Cully <brendan@kublai.com>
date Thu, 12 Apr 2007 14:45:53 -0700
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