--- a/tests/test-contrib.t Wed Feb 10 08:25:03 2016 -0800
+++ b/tests/test-contrib.t Wed Feb 10 09:06:08 2016 -0800
@@ -148,11 +148,10 @@
base
<<<<<<< conflict-local
not other
- end
=======
other
+ >>>>>>> conflict-other
end
- >>>>>>> conflict-other
[1]
1 label
@@ -161,11 +160,10 @@
base
<<<<<<< foo
not other
- end
=======
other
+ >>>>>>> conflict-other
end
- >>>>>>> conflict-other
[1]
2 labels
@@ -174,11 +172,10 @@
base
<<<<<<< foo
not other
- end
=======
other
+ >>>>>>> bar
end
- >>>>>>> bar
[1]
3 labels