view tests/test-merge5.out @ 4407:8369672060b5

Test qtop breaking when series ends with guarded patches.
author Patrick Mezard <pmezard@gmail.com>
date Sun, 06 May 2007 18:19:25 +0200
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