view tests/test-merge5.out @ 9040:4743d1a65dfe

test: fix for compatibilty with true Bourne /bin/sh

'export foo=bar' is an extension, replaced with 'foo=bar; export foo'

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' or 'hg update -C' to discard changes)
% should succeed
abort: crosses branches (use 'hg merge' or 'hg update -C')