mirror of
https://github.com/opnsense/src.git
synced 2026-06-30 21:07:14 -04:00
cf73401c4f
This is mostly thj@'s work, with some tweaks and cleanup by me. There are still some cases where our output differs from GNU diff3, but it's much better than before and I'd rather commit what I have now than let it continue to languish in a metaphorical drawer. MFC after 3 weeks Sponsored by: Klara, Inc. Reviewed by: thj Differential Revision: https://reviews.freebsd.org/D46762 |
||
|---|---|---|
| .. | ||
| tests | ||
| diff3.1 | ||
| diff3.c | ||
| Makefile | ||