diff -r abb5ec3eb6ce -r ef1eb6df7071 tests/test-contrib.t
--- a/tests/test-contrib.t	Sun Oct 11 15:04:00 2015 -0700
+++ b/tests/test-contrib.t	Fri Oct 09 13:54:52 2015 -0700
@@ -153,7 +153,6 @@
   other
   end
   >>>>>>> conflict-other
-  warning: conflicts during merge.
   [1]
 
 1 label
@@ -167,7 +166,6 @@
   other
   end
   >>>>>>> conflict-other
-  warning: conflicts during merge.
   [1]
 
 2 labels
@@ -181,7 +179,6 @@
   other
   end
   >>>>>>> bar
-  warning: conflicts during merge.
   [1]
 
 3 labels
@@ -196,7 +193,6 @@
   other
   end
   >>>>>>> bar
-  warning: conflicts during merge.
   [1]
 
 too many labels