Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 6d82384
Add more test for 3 way merge
Baptiste Daroussin committed 11 years ago
commit 6d82384b0f816bf0b9dcad4527679837907b4d94
parent f7031e2
1 file changed +8 -0
modified tests/lib/merge.c
@@ -55,6 +55,14 @@ ATF_TC_BODY(merge, tc)
	ATF_REQUIRE_EQ(merge_3way(pivot, modified, new, b), 0);

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


	sbuf_delete(b);

}