tests/test-mq-merge.t
branchstable
changeset 16124 0e0060bf2f44
parent 15775 91eb4512edd0
child 20294 243ea5ffdf31
--- a/tests/test-mq-merge.t	Mon Feb 13 16:47:31 2012 +0100
+++ b/tests/test-mq-merge.t	Mon Feb 13 17:22:35 2012 +0100
@@ -125,12 +125,10 @@
   merging with queue at: $TESTTMP/t2/.hg/refqueue (glob)
   applying patcha
   patching file a
-  Hunk #1 FAILED at 0
-  1 out of 1 hunks FAILED -- saving rejects to file a.rej
-  patch failed, unable to continue (try -v)
-  patch failed, rejects left in working dir
+  Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines).
+  fuzz found when applying patch, stopping
   patch didn't work out, merging patcha
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   0 files updated, 2 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   applying patcha2