Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
History for libpkg/merge3.c  ·  View all commits
11 commits
S
Merge commit '74fd3389a4ee2611603ee8658d2f3b4182ace73e'
Shawn Webb
5 years ago b759c48
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 3 way merge on large files
Baptiste Daroussin
10 years ago 2c587f0
L
Merge branch 'master' into osx/main
Landon Fuller
11 years ago 765e51f
S
Remove unused variable.
Sean Chittenden
11 years ago 59b7a07
S
Remove unused variable.
Sean Chittenden
11 years ago aa2d44a
B
Fix merge eating some characters
Baptiste Daroussin
11 years ago 98741f8
B
Do not add a trailing newline when not necessary in 3 way merge
Baptiste Daroussin
11 years ago f7031e2
B
Remove check on return, the caller will have to check to know what to do
Baptiste Daroussin
11 years ago 45fa85d
B
Import from fossil 3 way merge code
Baptiste Daroussin
11 years ago dda97b3