# HG changeset patch
# User Sean Farley <sean@farley.io>
# Date 1445037291 25200
# Node ID 93d58b79d8163687d33ee39fcb464ba2d10ad8ce
# Parent  c85c28fbc8a5951d736a4b292f80c3db8c2e2330
tests: update for new merge output

diff -r c85c28fbc8a5 -r 93d58b79d816 tests/test-conflict-1.t
--- a/tests/test-conflict-1.t	Thu Oct 15 13:55:30 2015 -0700
+++ b/tests/test-conflict-1.t	Fri Oct 16 16:14:51 2015 -0700
@@ -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 -r c85c28fbc8a5 -r 93d58b79d816 tests/test-conflict-2.t
--- a/tests/test-conflict-2.t	Thu Oct 15 13:55:30 2015 -0700
+++ b/tests/test-conflict-2.t	Fri Oct 16 16:14:51 2015 -0700
@@ -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