view tests/test-merge5.out @ 3725:ccc7a9eb0e5e

transplant: preserve filter changes in --continue log
author Brendan Cully <brendan@kublai.com>
date Thu, 30 Nov 2006 11:32:40 -0800
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