News for hackers. Stuff that matters.

A comment on Git cherry-pick and revert use 3-way merge. Parent comment

Re:Git cherry-pick and revert use 3-way merge by loeg on Friday November 10, 2023 @03:42PM (#38224255)
The BSD version is sort of very recent, for what it's worth -- FreeBSD imported a not fully functional version in 2017 and has seen more work on it in 2022: https://github.com/freebsd/freebsd-src/commits/main/usr.bin/... , but the default version shipped is still GNU diff3 from ~2007 (before the GPL3): https://man.freebsd.org/cgi/man.cgi?query=diff3&apropos=0&se... .
[ Parent | on HN ]
Re:Git cherry-pick and revert use 3-way merge by not2b on Friday November 10, 2023 @06:43PM (#38226059)
I wasn't aware of that. Perhaps they never re-implemented the version from Bell Labs so they didn't have a free program (other than the GNU one) that they could release until more recently?
[ Parent | on HN ]