summaryrefslogtreecommitdiff
path: root/usr.bin/diff3
AgeCommit message (Expand)Author
2024-09-26diff3: Remove debugging remnant.Dag-Erling Smørgrav
2024-09-25diff3: Fix merge mode.Dag-Erling Smørgrav
2024-07-15Remove residual blank line at start of MakefileWarner Losh
2023-11-26usr.bin: Automated cleanup of cdefs and other formattingWarner Losh
2023-11-26usr.bin: Remove ancient SCCS tags.Warner Losh
2023-09-06diff3: make the diff3 -E -m and diff3 -m behaviour match gnu diff3Baptiste Daroussin
2023-08-16Remove $FreeBSD$: one-line nroff patternWarner Losh
2023-08-16Remove $FreeBSD$: one-line sh patternWarner Losh
2023-08-16Remove $FreeBSD$: one-line .c patternWarner Losh
2022-08-02diff3: Use ranges for new and old diffedits in ed scriptsTom Jones
2022-08-02diff3: Use ranges for the old and new diffedits in A scriptsTom Jones
2022-08-02diff3: Simplify startmark calculation in AscriptTom Jones
2022-08-01diff3: Use variables for old and new in A scriptsTom Jones
2022-08-01diff3: Replace literal marker with variableTom Jones
2022-08-01diff3: Fix indentationTom Jones
2022-07-05diff3: make the eflag logic easier to followTom Jones
2022-06-23diff3: Add man page description for version and helpTom Jones
2022-05-25diff3: Add help and version optionsTom Jones
2022-05-25diff3: Copy line into debug informationTom Jones
2022-05-25diff3: Don't perform a bitwise OR when comparing diffsTom Jones
2022-05-02diff3: Remove test case that references non existent test filesTom Jones
2022-04-19diff3: Add support for -mTom Jones
2022-04-19diff3: Add support for -ATom Jones
2022-04-19diff3: seperate old and new markers from file markersTom Jones
2022-04-19diff3: Clean up printing of ranges for edscript outputTom Jones
2022-04-15diff3: allow diff3 ed scripts to generate deletionsTom Jones
2021-08-25diff3: document and test -TPiotr Pawel Stefaniak
2021-08-23diff3: implement --strip-trailing-crPiotr Pawel Stefaniak
2021-08-23diff3.1: update manual page to match codePiotr Pawel Stefaniak
2021-08-23diff3: improve stylePiotr Pawel Stefaniak
2021-08-23diff3: sync with upstreamPiotr Pawel Stefaniak
2019-12-17Replace homemade getline(3) by actual getline(3)Baptiste Daroussin
2019-12-17Use strtoimax.Baptiste Daroussin
2018-11-04capsicum: use a new capsicum helpers in toolsMariusz Zaborski
2018-06-19Convert `cap_enter() < 0 && errno != ENOSYS` to `caph_enter() < 0`.Mariusz Zaborski
2017-10-31DIRDEPS_BUILD: Connect new directories.Bryan Drewery
2017-08-02Add HAS_TESTS to all Makefiles that are currently using theEnji Cooper
2017-08-02Convert traditional ${MK_TESTS} conditional idiom for including testEnji Cooper
2017-05-25Update the diff3 manpage to reflect the fact the version in freebsd doesBaptiste Daroussin
2017-05-25For now comment tests for arguments which are not in par with GNU diff3 yetBaptiste Daroussin
2017-05-25Remove the MAX_CHECK macro, it was initially used to test if a file was aBaptiste Daroussin
2017-05-25Import working progress BSD diff3Baptiste Daroussin
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-20 00:13:30 +0000