Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
History for tests/lib/merge.c  ·  View all commits
12 commits
S
Merge branch 'upstream-master'
Shawn Webb
3 years ago fa6223f
B
test: use ATF_TC_WITHOUT_HEAD to simplify code for tests
Baptiste Daroussin
3 years ago e04d9e6
S
Merge commit '74fd3389a4ee2611603ee8658d2f3b4182ace73e'
Shawn Webb
5 years ago b759c48
B
tests: get rid of utstring
Baptiste Daroussin
5 years ago 29aebd8
B
merge3: get rid of utstring
Baptiste Daroussin
5 years ago d88f0c4
B
Replace libsbuf with utstring.h to improve portability
Baptiste Daroussin
9 years ago f93c045
B
Fix merge test
Baptiste Daroussin
10 years ago fd115da
B
Add a test checking the pervious failure
Baptiste Daroussin
11 years ago 25eef44
B
Add more test for 3 way merge
Baptiste Daroussin
11 years ago 6d82384
B
Do not add a trailing newline when not necessary in 3 way merge
Baptiste Daroussin
11 years ago f7031e2
B
plug memory leak in 3way merge test
Baptiste Daroussin
11 years ago c72f5c8
B
Add a minimal regression test for 3 way merge
Baptiste Daroussin
11 years ago 578a6bf