[Midnightbsd-cvs] [MidnightBSD/src] 621d41: Update diff/diff3 to match freebsd current

Lucas Holt noreply at github.com
Mon Mar 31 14:44:33 EDT 2025 

  Branch: refs/heads/master
  Home:   https://github.com/MidnightBSD/src
  Commit: 621d4136f10e97718face7c7eb48b0ab5c670ce7
      https://github.com/MidnightBSD/src/commit/621d4136f10e97718face7c7eb48b0ab5c670ce7
  Author: Lucas Holt <luke at foolishgames.com>
  Date:   2025-03-31 (Mon, 31 Mar 2025)

  Changed paths:
    A contrib/libdiff/.gitignore
    A contrib/libdiff/LICENCE
    A contrib/libdiff/README
    A contrib/libdiff/compat/getprogname_linux.c
    A contrib/libdiff/compat/include/stdlib.h
    A contrib/libdiff/compat/include/string.h
    A contrib/libdiff/compat/include/sys/types.h
    A contrib/libdiff/compat/merge.c
    A contrib/libdiff/compat/reallocarray.c
    A contrib/libdiff/compat/recallocarray.c
    A contrib/libdiff/compat/strlcat.c
    A contrib/libdiff/compat/strlcpy.c
    A contrib/libdiff/diff-version.mk
    A contrib/libdiff/diff/GNUmakefile
    A contrib/libdiff/diff/Makefile
    A contrib/libdiff/diff/diff.c
    A contrib/libdiff/include/arraylist.h
    A contrib/libdiff/include/diff_main.h
    A contrib/libdiff/include/diff_output.h
    A contrib/libdiff/lib/GNUmakefile
    A contrib/libdiff/lib/diff_atomize_text.c
    A contrib/libdiff/lib/diff_debug.h
    A contrib/libdiff/lib/diff_internal.h
    A contrib/libdiff/lib/diff_main.c
    A contrib/libdiff/lib/diff_myers.c
    A contrib/libdiff/lib/diff_output.c
    A contrib/libdiff/lib/diff_output_edscript.c
    A contrib/libdiff/lib/diff_output_plain.c
    A contrib/libdiff/lib/diff_output_unidiff.c
    A contrib/libdiff/lib/diff_patience.c
    A contrib/libdiff/man/diff.1
    A contrib/libdiff/test/GNUmakefile
    A contrib/libdiff/test/Makefile
    A contrib/libdiff/test/README
    A contrib/libdiff/test/arraylist_test.c
    A contrib/libdiff/test/arraylist_test/GNUmakefile
    A contrib/libdiff/test/arraylist_test/Makefile
    A contrib/libdiff/test/expect.arraylist_test
    A contrib/libdiff/test/expect.results_test
    A contrib/libdiff/test/expect001.diff
    A contrib/libdiff/test/expect002.diff
    A contrib/libdiff/test/expect003.diff
    A contrib/libdiff/test/expect004.diff
    A contrib/libdiff/test/expect005.diff
    A contrib/libdiff/test/expect006.diff
    A contrib/libdiff/test/expect007.diff
    A contrib/libdiff/test/expect008.diff
    A contrib/libdiff/test/expect009.diff
    A contrib/libdiff/test/expect010.diff
    A contrib/libdiff/test/expect011.diff
    A contrib/libdiff/test/expect012.diff
    A contrib/libdiff/test/expect013.diff
    A contrib/libdiff/test/expect014.diff
    A contrib/libdiff/test/expect015.diff
    A contrib/libdiff/test/expect016.diff
    A contrib/libdiff/test/expect018.diff
    A contrib/libdiff/test/expect019.diff
    A contrib/libdiff/test/expect021.diff
    A contrib/libdiff/test/expect101.diff
    A contrib/libdiff/test/expect102.diff
    A contrib/libdiff/test/expect103.diff
    A contrib/libdiff/test/expect104.diff
    A contrib/libdiff/test/expect105.diff
    A contrib/libdiff/test/expect106.diff
    A contrib/libdiff/test/expect107.diff
    A contrib/libdiff/test/expect108.diff
    A contrib/libdiff/test/expect109.diff
    A contrib/libdiff/test/expect110.diff
    A contrib/libdiff/test/expect111.diff
    A contrib/libdiff/test/expect112.diff
    A contrib/libdiff/test/expect113.diff
    A contrib/libdiff/test/expect114.diff
    A contrib/libdiff/test/expect115.diff
    A contrib/libdiff/test/expect116.diff
    A contrib/libdiff/test/expect117.diff
    A contrib/libdiff/test/expect123.diff
    A contrib/libdiff/test/expect124.diff
    A contrib/libdiff/test/expect125.diff
    A contrib/libdiff/test/expect126.diff
    A contrib/libdiff/test/results_test.c
    A contrib/libdiff/test/results_test/GNUmakefile
    A contrib/libdiff/test/results_test/Makefile
    A contrib/libdiff/test/test001.left.txt
    A contrib/libdiff/test/test001.right.txt
    A contrib/libdiff/test/test002.left.txt
    A contrib/libdiff/test/test002.right.txt
    A contrib/libdiff/test/test003.left.txt
    A contrib/libdiff/test/test003.right.txt
    A contrib/libdiff/test/test004.left.txt
    A contrib/libdiff/test/test004.right.txt
    A contrib/libdiff/test/test005.left.txt
    A contrib/libdiff/test/test005.right.txt
    A contrib/libdiff/test/test006.left.txt
    A contrib/libdiff/test/test006.right.txt
    A contrib/libdiff/test/test007.left.txt
    A contrib/libdiff/test/test007.right.txt
    A contrib/libdiff/test/test008.left.txt
    A contrib/libdiff/test/test008.right.txt
    A contrib/libdiff/test/test009.left.txt
    A contrib/libdiff/test/test009.right.txt
    A contrib/libdiff/test/test010.left.txt
    A contrib/libdiff/test/test010.right.txt
    A contrib/libdiff/test/test011.left.txt
    A contrib/libdiff/test/test011.right.txt
    A contrib/libdiff/test/test012.left.txt
    A contrib/libdiff/test/test012.right.txt
    A contrib/libdiff/test/test013.left-w.txt
    A contrib/libdiff/test/test013.right-w.txt
    A contrib/libdiff/test/test014.left.txt
    A contrib/libdiff/test/test014.right.txt
    A contrib/libdiff/test/test015.left.txt
    A contrib/libdiff/test/test015.right.txt
    A contrib/libdiff/test/test016.left.txt
    A contrib/libdiff/test/test016.right.txt
    A contrib/libdiff/test/test017.left-U0.txt
    A contrib/libdiff/test/test017.right-U0.txt
    A contrib/libdiff/test/test018.left-T.txt
    A contrib/libdiff/test/test018.right-T.txt
    A contrib/libdiff/test/test019.left.txt
    A contrib/libdiff/test/test019.right.txt
    A contrib/libdiff/test/test020.left.txt
    A contrib/libdiff/test/test020.right.txt
    A contrib/libdiff/test/test021.left.txt
    A contrib/libdiff/test/test021.right.txt
    A contrib/libdiff/test/test101.left-P.txt
    A contrib/libdiff/test/test101.right-P.txt
    A contrib/libdiff/test/test102.left-P.txt
    A contrib/libdiff/test/test102.right-P.txt
    A contrib/libdiff/test/test103.left-P.txt
    A contrib/libdiff/test/test103.right-P.txt
    A contrib/libdiff/test/test104.left-P.txt
    A contrib/libdiff/test/test104.right-P.txt
    A contrib/libdiff/test/test105.left-P.txt
    A contrib/libdiff/test/test105.right-P.txt
    A contrib/libdiff/test/test106.left-P.txt
    A contrib/libdiff/test/test106.right-P.txt
    A contrib/libdiff/test/test107.left-P.txt
    A contrib/libdiff/test/test107.right-P.txt
    A contrib/libdiff/test/test108.left-P.txt
    A contrib/libdiff/test/test108.right-P.txt
    A contrib/libdiff/test/test109.left-P.txt
    A contrib/libdiff/test/test109.right-P.txt
    A contrib/libdiff/test/test110.left-P.txt
    A contrib/libdiff/test/test110.right-P.txt
    A contrib/libdiff/test/test111.left-P.txt
    A contrib/libdiff/test/test111.right-P.txt
    A contrib/libdiff/test/test112.left-P.txt
    A contrib/libdiff/test/test112.right-P.txt
    A contrib/libdiff/test/test113.left-Pw.txt
    A contrib/libdiff/test/test113.right-Pw.txt
    A contrib/libdiff/test/test114.left-P.txt
    A contrib/libdiff/test/test114.right-P.txt
    A contrib/libdiff/test/test115.left-P.txt
    A contrib/libdiff/test/test115.right-P.txt
    A contrib/libdiff/test/test116.left-P.txt
    A contrib/libdiff/test/test116.right-P.txt
    A contrib/libdiff/test/test117.left-P.txt
    A contrib/libdiff/test/test117.right-P.txt
    A contrib/libdiff/test/test122.left-P.txt
    A contrib/libdiff/test/test122.right-P.txt
    A contrib/libdiff/test/test123.left-e.txt
    A contrib/libdiff/test/test123.right-e.txt
    A contrib/libdiff/test/test124.left-p.txt
    A contrib/libdiff/test/test124.right-p.txt
    A contrib/libdiff/test/test125.left.txt
    A contrib/libdiff/test/test125.right.txt
    A contrib/libdiff/test/test126.left.txt
    A contrib/libdiff/test/test126.right.txt
    A contrib/libdiff/test/verify_all.sh
    M lib/Makefile
    A lib/libdiff/Makefile
    A lib/libdiff/tests/Makefile
    A lib/libdiff/tests/libdiff_test.c
    M share/mk/src.libnames.mk
    M usr.bin/diff/Makefile
    M usr.bin/diff/diff.1
    M usr.bin/diff/diff.c
    M usr.bin/diff/diff.h
    M usr.bin/diff/diffdir.c
    M usr.bin/diff/diffreg.c
    A usr.bin/diff/diffreg_new.c
    M usr.bin/diff/pr.c
    M usr.bin/diff/tests/Makefile
    M usr.bin/diff/tests/diff_test.sh
    A usr.bin/diff/tests/functionname.in
    A usr.bin/diff/tests/functionname_c.in
    A usr.bin/diff/tests/functionname_c.out
    A usr.bin/diff/tests/functionname_objcclassm.in
    A usr.bin/diff/tests/functionname_objcclassm.out
    A usr.bin/diff/tests/functionname_objcm.in
    A usr.bin/diff/tests/functionname_objcm.out
    A usr.bin/diff/tests/side_by_side_tabbed_a.in
    A usr.bin/diff/tests/side_by_side_tabbed_b.in
    M usr.bin/diff/xmalloc.c
    M usr.bin/diff3/diff3.1
    M usr.bin/diff3/diff3.c
    M usr.bin/diff3/tests/Makefile
    M usr.bin/diff3/tests/diff3_test.sh
    A usr.bin/diff3/tests/fbsdid1.txt
    A usr.bin/diff3/tests/fbsdid2.txt
    A usr.bin/diff3/tests/long-A.out
    A usr.bin/diff3/tests/long-ed.out
    A usr.bin/diff3/tests/long-m.txt
    A usr.bin/diff3/tests/long-merge.out
    A usr.bin/diff3/tests/long-o.txt
    A usr.bin/diff3/tests/long-y.txt

  Log Message:
  -----------
  Update diff/diff3 to match freebsd current


  Commit: 379153a98d49b86d15dea958575a77439a0fdb87
      https://github.com/MidnightBSD/src/commit/379153a98d49b86d15dea958575a77439a0fdb87
  Author: Lucas Holt <luke at foolishgames.com>
  Date:   2025-03-31 (Mon, 31 Mar 2025)

  Changed paths:
    M usr.bin/sdiff/Makefile
    M usr.bin/sdiff/edit.c
    M usr.bin/sdiff/sdiff.c
    M usr.bin/sdiff/tests/Makefile

  Log Message:
  -----------
  cleanup


Compare: https://github.com/MidnightBSD/src/compare/39cd3ee2bdda...379153a98d49

To unsubscribe from these emails, change your notification settings at https://github.com/MidnightBSD/src/settings/notifications

More information about the Midnightbsd-cvs mailing list