diff --git a/tests/test-conflict-1.t b/tests/test-conflict-1.t index c85c28fbc8a5951d736a4b292f80c3db8c2e2330_dGVzdHMvdGVzdC1jb25mbGljdC0xLnQ=..93d58b79d8163687d33ee39fcb464ba2d10ad8ce_dGVzdHMvdGVzdC1jb25mbGljdC0xLnQ= 100644 --- a/tests/test-conflict-1.t +++ b/tests/test-conflict-1.t @@ -16,9 +16,8 @@ $ hg ci -m "A->C" created new head - $ hg merge -r1 2>&1 | sed 's/-C ./-C/' | egrep -v '^merging afile$' | sed 's/incomplete.*/failed!/' - warning: conflicts during merge. - merging afile failed! + $ hg merge -r1 2>&1 | sed 's/-C ./-C/' | egrep -v '^merging afile' | sed 's/incomplete.*/failed!/' + warning: conflicts.* (re) 0 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 resolve using first parent diff --git a/tests/test-conflict-2.t b/tests/test-conflict-2.t index c85c28fbc8a5951d736a4b292f80c3db8c2e2330_dGVzdHMvdGVzdC1jb25mbGljdC0yLnQ=..93d58b79d8163687d33ee39fcb464ba2d10ad8ce_dGVzdHMvdGVzdC1jb25mbGljdC0yLnQ= 100644 --- a/tests/test-conflict-2.t +++ b/tests/test-conflict-2.t @@ -16,9 +16,8 @@ $ hg ci -m "A->C" created new head - $ hg merge -r1 2>&1 | sed 's/-C ./-C/' | egrep -v '^merging afile$' | sed 's/incomplete.*/failed!/' - warning: conflicts during merge. - merging afile failed! + $ hg merge -r1 2>&1 | sed 's/-C ./-C/' | egrep -v '^merging afile' | sed 's/incomplete.*/failed!/' + warning: conflicts.* (re) 0 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 resolve using second parent