"Enji Cooper (yaneurabeya)" <[email protected]> writes: > It looks like the diff3(1) code came from OpenBSD (at one point in > time). Are there any plans to converge/merge with that codebase in the > future?
Theirs doesn't work. Ours does, and that took a lot of work. They're welcome to merge our improvements. DES -- Dag-Erling Smørgrav - [email protected]
