tests/test-merge5.out
author Patrick Mezard <pmezard@gmail.com>
Fri, 01 Jan 2010 19:53:05 +0100
branchstable
changeset 10186 296a0b14a686
parent 9717 68a1b9d0663e
permissions -rw-r--r--
mq: preserve --git flag when folding patches Without this, folding a git patch into a regular one downgrades the resulting patch to a regular patch.

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
created new head
% should abort
abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes)
% should succeed
1 files updated, 0 files merged, 0 files removed, 0 files unresolved