Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Add a test checking the pervious failure
Baptiste Daroussin committed 11 years ago
commit 25eef44ae07c03d625a8fb7c93f2116aea0e0be4
parent 98741f8
1 file changed +8 -0
modified tests/lib/merge.c
@@ -63,6 +63,14 @@ ATF_TC_BODY(merge, tc)
	ATF_REQUIRE_EQ(merge_3way(pivot, modified, new, b), 0);
	ATF_REQUIRE_STREQ(sbuf_data(b), "test1\ntest3");

+
	sbuf_clear(b);
+
	pivot = "test1\ntest2\ntest3";
+
	modified = "test1\na\ntest2\ntest3";
+
	new = "test1\ntest2\ntest3";
+

+
	ATF_REQUIRE_EQ(merge_3way(pivot, modified, new, b), 0);
+
	ATF_REQUIRE_STREQ(sbuf_data(b), "test1\na\ntest2\ntest3");
+

	sbuf_delete(b);
}