view tests/test-merge5.out @ 5213:988ed47d9d65

mq: some improvements to header rewriting (closes #690) Tested with qrefresh -m against the mm series.
author Brendan Cully <brendan@kublai.com>
date Thu, 23 Aug 2007 13:59:52 -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