aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/diff3
Commit message (Expand)AuthorAgeFilesLines
* diff3: set O_CLOEXEC on pipesBaptiste Daroussin11 days1-6/+2
* diff3: plug fd leakBaptiste Daroussin13 days1-0/+1
* diff3: prefer posix_spawn over pdfork/execlpBaptiste Daroussin13 days1-18/+29
* diff3: Add SPDX-License-Identifier tagTuukka Pasanen2026-03-031-0/+2
* diff3: Produce correct exit statusDag-Erling Smørgrav2026-03-022-14/+29
* diff3: bump version to the date when the GNU diff3 compat was reachedBaptiste Daroussin2026-03-011-1/+1
* diff3: Code cleanupDag-Erling Smørgrav2026-02-281-29/+19
* diff3: add 3 missing files from the testsuiteBaptiste Daroussin2026-02-132-0/+44
* diff3: fix merge modeBaptiste Daroussin2026-02-1315-30/+168
* diff3: fix diff3 -ABaptiste Daroussin2026-02-131-7/+24
* diff3: use pdwait instead of homemade oneBaptiste Daroussin2026-02-021-37/+19
* diff3: Remove debugging remnant.Dag-Erling Smørgrav2024-09-261-1/+0
* diff3: Fix merge mode.Dag-Erling Smørgrav2024-09-251-76/+179
* Remove residual blank line at start of MakefileWarner Losh2024-07-152-2/+0
* usr.bin: Automated cleanup of cdefs and other formattingWarner Losh2023-11-271-3/+0
* usr.bin: Remove ancient SCCS tags.Warner Losh2023-11-272-7/+0
* diff3: make the diff3 -E -m and diff3 -m behaviour match gnu diff3Baptiste Daroussin2023-09-065-3/+49
* Remove $FreeBSD$: one-line nroff patternWarner Losh2023-08-161-1/+0
* Remove $FreeBSD$: one-line sh patternWarner Losh2023-08-164-4/+0
* Remove $FreeBSD$: one-line .c patternWarner Losh2023-08-161-2/+0
* diff3: Use ranges for new and old diffedits in ed scriptsTom Jones2022-08-021-5/+9
* diff3: Use ranges for the old and new diffedits in A scriptsTom Jones2022-08-021-18/+23
* diff3: Simplify startmark calculation in AscriptTom Jones2022-08-021-2/+3
* diff3: Use variables for old and new in A scriptsTom Jones2022-08-011-17/+19
* diff3: Replace literal marker with variableTom Jones2022-08-011-5/+6
* diff3: Fix indentationTom Jones2022-08-011-1/+1
* diff3: make the eflag logic easier to followTom Jones2022-07-051-13/+20
* diff3: Add man page description for version and helpTom Jones2022-06-231-2/+9
* diff3: Add help and version optionsTom Jones2022-05-251-3/+16
* diff3: Copy line into debug informationTom Jones2022-05-251-1/+1
* diff3: Don't perform a bitwise OR when comparing diffsTom Jones2022-05-251-1/+1
* diff3: Remove test case that references non existent test filesTom Jones2022-05-021-2/+1
* diff3: Add support for -mTom Jones2022-04-195-3/+137
* diff3: Add support for -ATom Jones2022-04-195-8/+157
* diff3: seperate old and new markers from file markersTom Jones2022-04-191-5/+8
* diff3: Clean up printing of ranges for edscript outputTom Jones2022-04-191-35/+37
* diff3: allow diff3 ed scripts to generate deletionsTom Jones2022-04-157-16/+113
* diff3: document and test -TPiotr Pawel Stefaniak2021-08-254-2/+27
* diff3: implement --strip-trailing-crPiotr Pawel Stefaniak2021-08-235-1/+21
* diff3.1: update manual page to match codePiotr Pawel Stefaniak2021-08-231-6/+27
* diff3: improve stylePiotr Pawel Stefaniak2021-08-231-17/+19
* diff3: sync with upstreamPiotr Pawel Stefaniak2021-08-231-6/+15
* Replace homemade getline(3) by actual getline(3)Baptiste Daroussin2019-12-171-17/+5
* Use strtoimax.Baptiste Daroussin2019-12-171-16/+6
* capsicum: use a new capsicum helpers in toolsMariusz Zaborski2018-11-041-3/+3
* Convert `cap_enter() < 0 && errno != ENOSYS` to `caph_enter() < 0`.Mariusz Zaborski2018-06-191-1/+1
* DIRDEPS_BUILD: Connect new directories.Bryan Drewery2017-10-311-0/+11
* Add HAS_TESTS to all Makefiles that are currently using theEnji Cooper2017-08-021-0/+1
* Convert traditional ${MK_TESTS} conditional idiom for including testEnji Cooper2017-08-021-3/+1
* Update the diff3 manpage to reflect the fact the version in freebsd doesBaptiste Daroussin2017-05-251-21/+1