view tests/test-merge4.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 b2ae81a7df29
children 4b0c9c674707
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)