Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Fix merge test
Baptiste Daroussin committed 10 years ago
commit fd115da2c3510dda263de2fe394ecb7a28334a71
parent 1713b5a
1 file changed +1 -1
modified tests/lib/merge.c
@@ -53,7 +53,7 @@ ATF_TC_BODY(merge, tc)
	new = "test1\ntest2\ntest3";

	ATF_REQUIRE_EQ(merge_3way(pivot, modified, new, b), 0);
-
	ATF_REQUIRE_STREQ(sbuf_data(b), "test1\n#test2\ntest3");
+
	ATF_REQUIRE_STREQ(sbuf_data(b), "test1\n#test2test3");

	sbuf_clear(b);
	pivot = "test1\ntest2";