bundle: add test for Issue1704
Original version by Greg Ward.
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
% Merging a conflict araises
merging A
warning: conflicts during merge.
merging A failed!
1 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
% Correct the conflict without marking the file as resolved
abort: unresolved merge conflicts (see hg resolve)
% Mark the conflict as resolved and commit