* %s -- FAILED
--- expected
+++ got
@@ -1,7 +1 @@
-1
-2
-3
 
-1
-2
-3
* %s -- FAILED
--- expected
+++ got
@@ -1,5 +1 @@
-1
-3
 
-1
-3
* %s -- FAILED
--- expected
+++ got
@@ -1,7 +1 @@
-1
-b
-2
 
-1
-b
-2
* %s -- ok
* %s -- ok
* %s -- ok
* %s -- ok
* %s -- ok
* %s -- ok
* %s -- ok
* %s -- ok
* %s -- ok
* %s -- ok
* %s -- ok
* %s -- ok
* %s -- ok
* %s -- ok
* %s -- ok
* %s -- ok
* %s -- ok
* %s -- ok
* %s -- ok
* %s -- ok
* %s -- ok
* %s -- ok
* %s -- ok
* %s -- ok
27 tests (24 passed, 3 failed)
FAIL merge (exit status: 1)