git: 59c8e88e7263 - main - Add 'contrib/libdiff/' from commit '9eb461aa4b61ab47855b2cee9e5b626a76888b5e'
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 11 Mar 2024 13:48:37 UTC
The branch main has been updated by des:
URL: https://cgit.FreeBSD.org/src/commit/?id=59c8e88e72633afbc47a4ace0d2170d00d51f7dc
commit 59c8e88e72633afbc47a4ace0d2170d00d51f7dc
Merge: f6d489f402c3 9eb461aa4b61
Author: Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2024-03-11 13:44:36 +0000
Commit: Dag-Erling Smørgrav <des@FreeBSD.org>
CommitDate: 2024-03-11 13:48:08 +0000
Add 'contrib/libdiff/' from commit '9eb461aa4b61ab47855b2cee9e5b626a76888b5e'
git-subtree-dir: contrib/libdiff
git-subtree-mainline: f6d489f402c320f1a6eaa473491a0b8c3878113e
git-subtree-split: 9eb461aa4b61ab47855b2cee9e5b626a76888b5e
Reviewed by: imp
Sponsored by: Klara, Inc.
contrib/libdiff/.gitignore | 13 +
contrib/libdiff/LICENCE | 13 +
contrib/libdiff/README | 26 +
contrib/libdiff/compat/getprogname_linux.c | 8 +
contrib/libdiff/compat/include/stdlib.h | 20 +
contrib/libdiff/compat/include/string.h | 16 +
contrib/libdiff/compat/include/sys/types.h | 15 +
contrib/libdiff/compat/merge.c | 338 +
contrib/libdiff/compat/reallocarray.c | 38 +
contrib/libdiff/compat/recallocarray.c | 80 +
contrib/libdiff/compat/strlcat.c | 55 +
contrib/libdiff/compat/strlcpy.c | 50 +
contrib/libdiff/diff-version.mk | 8 +
contrib/libdiff/diff/GNUmakefile | 19 +
contrib/libdiff/diff/Makefile | 41 +
contrib/libdiff/diff/diff.c | 280 +
contrib/libdiff/include/arraylist.h | 121 +
contrib/libdiff/include/diff_main.h | 264 +
contrib/libdiff/include/diff_output.h | 112 +
contrib/libdiff/lib/GNUmakefile | 32 +
contrib/libdiff/lib/diff_atomize_text.c | 197 +
contrib/libdiff/lib/diff_debug.h | 226 +
contrib/libdiff/lib/diff_internal.h | 157 +
contrib/libdiff/lib/diff_main.c | 663 +
contrib/libdiff/lib/diff_myers.c | 1425 +++
contrib/libdiff/lib/diff_output.c | 371 +
contrib/libdiff/lib/diff_output_edscript.c | 190 +
contrib/libdiff/lib/diff_output_plain.c | 246 +
contrib/libdiff/lib/diff_output_unidiff.c | 602 +
contrib/libdiff/lib/diff_patience.c | 647 +
contrib/libdiff/man/diff.1 | 47 +
contrib/libdiff/test/GNUmakefile | 11 +
contrib/libdiff/test/Makefile | 12 +
contrib/libdiff/test/README | 7 +
contrib/libdiff/test/arraylist_test.c | 58 +
contrib/libdiff/test/arraylist_test/GNUmakefile | 20 +
contrib/libdiff/test/arraylist_test/Makefile | 11 +
contrib/libdiff/test/expect.arraylist_test | 76 +
contrib/libdiff/test/expect.results_test | 14 +
contrib/libdiff/test/expect001.diff | 12 +
contrib/libdiff/test/expect002.diff | 16 +
contrib/libdiff/test/expect003.diff | 10 +
contrib/libdiff/test/expect004.diff | 24 +
contrib/libdiff/test/expect005.diff | 12 +
contrib/libdiff/test/expect006.diff | 24 +
contrib/libdiff/test/expect007.diff | 5 +
contrib/libdiff/test/expect008.diff | 9 +
contrib/libdiff/test/expect009.diff | 13 +
contrib/libdiff/test/expect010.diff | 19 +
contrib/libdiff/test/expect011.diff | 19 +
contrib/libdiff/test/expect012.diff | 21 +
contrib/libdiff/test/expect013.diff | 10 +
contrib/libdiff/test/expect014.diff | 4 +
contrib/libdiff/test/expect015.diff | 4 +
contrib/libdiff/test/expect016.diff | 30 +
contrib/libdiff/test/expect018.diff | 16 +
contrib/libdiff/test/expect019.diff | 204 +
contrib/libdiff/test/expect021.diff | 868 ++
contrib/libdiff/test/expect101.diff | 12 +
contrib/libdiff/test/expect102.diff | 16 +
contrib/libdiff/test/expect103.diff | 10 +
contrib/libdiff/test/expect104.diff | 24 +
contrib/libdiff/test/expect105.diff | 12 +
contrib/libdiff/test/expect106.diff | 24 +
contrib/libdiff/test/expect107.diff | 5 +
contrib/libdiff/test/expect108.diff | 9 +
contrib/libdiff/test/expect109.diff | 13 +
contrib/libdiff/test/expect110.diff | 19 +
contrib/libdiff/test/expect111.diff | 19 +
contrib/libdiff/test/expect112.diff | 21 +
contrib/libdiff/test/expect113.diff | 10 +
contrib/libdiff/test/expect114.diff | 4 +
contrib/libdiff/test/expect115.diff | 4 +
contrib/libdiff/test/expect116.diff | 30 +
contrib/libdiff/test/expect117.diff | 64 +
contrib/libdiff/test/expect123.diff | 1 +
contrib/libdiff/test/expect124.diff | 9 +
contrib/libdiff/test/expect125.diff | 12 +
contrib/libdiff/test/expect126.diff | 28 +
contrib/libdiff/test/results_test.c | 178 +
contrib/libdiff/test/results_test/GNUmakefile | 20 +
contrib/libdiff/test/results_test/Makefile | 11 +
contrib/libdiff/test/test001.left.txt | 7 +
contrib/libdiff/test/test001.right.txt | 6 +
contrib/libdiff/test/test002.left.txt | 10 +
contrib/libdiff/test/test002.right.txt | 9 +
contrib/libdiff/test/test003.left.txt | 5 +
contrib/libdiff/test/test003.right.txt | 4 +
contrib/libdiff/test/test004.left.txt | 14 +
contrib/libdiff/test/test004.right.txt | 14 +
contrib/libdiff/test/test005.left.txt | 7 +
contrib/libdiff/test/test005.right.txt | 7 +
contrib/libdiff/test/test006.left.txt | 25 +
contrib/libdiff/test/test006.right.txt | 25 +
contrib/libdiff/test/test007.left.txt | 1 +
contrib/libdiff/test/test007.right.txt | 1 +
contrib/libdiff/test/test008.left.txt | 1 +
contrib/libdiff/test/test008.right.txt | 6 +
contrib/libdiff/test/test009.left.txt | 3 +
contrib/libdiff/test/test009.right.txt | 10 +
contrib/libdiff/test/test010.left.txt | 14197 +++++++++++++++++++++
contrib/libdiff/test/test010.right.txt | 14201 ++++++++++++++++++++++
contrib/libdiff/test/test011.left.txt | 393 +
contrib/libdiff/test/test011.right.txt | 397 +
contrib/libdiff/test/test012.left.txt | 23 +
contrib/libdiff/test/test012.right.txt | 29 +
contrib/libdiff/test/test013.left-w.txt | 7 +
contrib/libdiff/test/test013.right-w.txt | 7 +
contrib/libdiff/test/test014.left.txt | 0
contrib/libdiff/test/test014.right.txt | 1 +
contrib/libdiff/test/test015.left.txt | 1 +
contrib/libdiff/test/test015.right.txt | 0
contrib/libdiff/test/test016.left.txt | 298 +
contrib/libdiff/test/test016.right.txt | 301 +
contrib/libdiff/test/test017.left-U0.txt | 15 +
contrib/libdiff/test/test017.right-U0.txt | 19 +
contrib/libdiff/test/test018.left-T.txt | 7 +
contrib/libdiff/test/test018.right-T.txt | 6 +
contrib/libdiff/test/test019.left.txt | 845 ++
contrib/libdiff/test/test019.right.txt | 904 ++
contrib/libdiff/test/test020.left.txt | 919 ++
contrib/libdiff/test/test020.right.txt | 935 ++
contrib/libdiff/test/test021.left.txt | 1367 +++
contrib/libdiff/test/test021.right.txt | 1251 ++
contrib/libdiff/test/test101.left-P.txt | 7 +
contrib/libdiff/test/test101.right-P.txt | 6 +
contrib/libdiff/test/test102.left-P.txt | 10 +
contrib/libdiff/test/test102.right-P.txt | 9 +
contrib/libdiff/test/test103.left-P.txt | 5 +
contrib/libdiff/test/test103.right-P.txt | 4 +
contrib/libdiff/test/test104.left-P.txt | 14 +
contrib/libdiff/test/test104.right-P.txt | 14 +
contrib/libdiff/test/test105.left-P.txt | 7 +
contrib/libdiff/test/test105.right-P.txt | 7 +
contrib/libdiff/test/test106.left-P.txt | 25 +
contrib/libdiff/test/test106.right-P.txt | 25 +
contrib/libdiff/test/test107.left-P.txt | 1 +
contrib/libdiff/test/test107.right-P.txt | 1 +
contrib/libdiff/test/test108.left-P.txt | 1 +
contrib/libdiff/test/test108.right-P.txt | 6 +
contrib/libdiff/test/test109.left-P.txt | 3 +
contrib/libdiff/test/test109.right-P.txt | 10 +
contrib/libdiff/test/test110.left-P.txt | 14197 +++++++++++++++++++++
contrib/libdiff/test/test110.right-P.txt | 14201 ++++++++++++++++++++++
contrib/libdiff/test/test111.left-P.txt | 393 +
contrib/libdiff/test/test111.right-P.txt | 397 +
contrib/libdiff/test/test112.left-P.txt | 23 +
contrib/libdiff/test/test112.right-P.txt | 29 +
contrib/libdiff/test/test113.left-Pw.txt | 7 +
contrib/libdiff/test/test113.right-Pw.txt | 7 +
contrib/libdiff/test/test114.left-P.txt | 0
contrib/libdiff/test/test114.right-P.txt | 1 +
contrib/libdiff/test/test115.left-P.txt | 1 +
contrib/libdiff/test/test115.right-P.txt | 0
contrib/libdiff/test/test116.left-P.txt | 298 +
contrib/libdiff/test/test116.right-P.txt | 301 +
contrib/libdiff/test/test117.left-P.txt | 1237 ++
contrib/libdiff/test/test117.right-P.txt | 1251 ++
contrib/libdiff/test/test122.left-P.txt | 1338 ++
contrib/libdiff/test/test122.right-P.txt | 1251 ++
contrib/libdiff/test/test123.left-e.txt | 1 +
contrib/libdiff/test/test123.right-e.txt | 2 +
contrib/libdiff/test/test124.left-p.txt | 15 +
contrib/libdiff/test/test124.right-p.txt | 15 +
contrib/libdiff/test/test125.left.txt | 7 +
contrib/libdiff/test/test125.right.txt | 7 +
contrib/libdiff/test/test126.left.txt | 171 +
contrib/libdiff/test/test126.right.txt | 170 +
contrib/libdiff/test/verify_all.sh | 115 +
169 files changed, 80272 insertions(+)
diff --cc contrib/libdiff/.gitignore
index 000000000000,000000000000..4ecef24b8c23
new file mode 100644
--- /dev/null
+++ b/contrib/libdiff/.gitignore
@@@ -1,0 -1,0 +1,13 @@@
++.*.sw?
++diff/diff
++*.o
++*.d
++*.a
++**/*.o
++**/*.d
++***/.a
++tags
++test/got*.diff
++test/verify.*
++test/arraylist_test/arraylist_test
++test/results_test/results_test
diff --cc contrib/libdiff/LICENCE
index 000000000000,d908088b90fc..d908088b90fc
mode 000000,100644..100644
--- a/contrib/libdiff/LICENCE
+++ b/contrib/libdiff/LICENCE
diff --cc contrib/libdiff/README
index 000000000000,4e99e6e3c2e2..4e99e6e3c2e2
mode 000000,100644..100644
--- a/contrib/libdiff/README
+++ b/contrib/libdiff/README
diff --cc contrib/libdiff/compat/getprogname_linux.c
index 000000000000,0957c6bc106b..0957c6bc106b
mode 000000,100644..100644
--- a/contrib/libdiff/compat/getprogname_linux.c
+++ b/contrib/libdiff/compat/getprogname_linux.c
diff --cc contrib/libdiff/compat/include/stdlib.h
index 000000000000,75b18881a7b7..75b18881a7b7
mode 000000,100644..100644
--- a/contrib/libdiff/compat/include/stdlib.h
+++ b/contrib/libdiff/compat/include/stdlib.h
diff --cc contrib/libdiff/compat/include/string.h
index 000000000000,75190903aba8..75190903aba8
mode 000000,100644..100644
--- a/contrib/libdiff/compat/include/string.h
+++ b/contrib/libdiff/compat/include/string.h
diff --cc contrib/libdiff/compat/include/sys/types.h
index 000000000000,f580c7c593a8..f580c7c593a8
mode 000000,100644..100644
--- a/contrib/libdiff/compat/include/sys/types.h
+++ b/contrib/libdiff/compat/include/sys/types.h
diff --cc contrib/libdiff/compat/merge.c
index 000000000000,a5b0d88aa337..a5b0d88aa337
mode 000000,100644..100644
--- a/contrib/libdiff/compat/merge.c
+++ b/contrib/libdiff/compat/merge.c
diff --cc contrib/libdiff/compat/reallocarray.c
index 000000000000,43f0b69158ac..43f0b69158ac
mode 000000,100644..100644
--- a/contrib/libdiff/compat/reallocarray.c
+++ b/contrib/libdiff/compat/reallocarray.c
diff --cc contrib/libdiff/compat/recallocarray.c
index 000000000000,d93abd2da5fd..d93abd2da5fd
mode 000000,100644..100644
--- a/contrib/libdiff/compat/recallocarray.c
+++ b/contrib/libdiff/compat/recallocarray.c
diff --cc contrib/libdiff/compat/strlcat.c
index 000000000000,c94e90deeeeb..c94e90deeeeb
mode 000000,100644..100644
--- a/contrib/libdiff/compat/strlcat.c
+++ b/contrib/libdiff/compat/strlcat.c
diff --cc contrib/libdiff/compat/strlcpy.c
index 000000000000,2fa498c3978b..2fa498c3978b
mode 000000,100644..100644
--- a/contrib/libdiff/compat/strlcpy.c
+++ b/contrib/libdiff/compat/strlcpy.c
diff --cc contrib/libdiff/diff-version.mk
index 000000000000,1d14cd7ecfcc..1d14cd7ecfcc
mode 000000,100644..100644
--- a/contrib/libdiff/diff-version.mk
+++ b/contrib/libdiff/diff-version.mk
diff --cc contrib/libdiff/diff/GNUmakefile
index 000000000000,63d0b8795665..63d0b8795665
mode 000000,100644..100644
--- a/contrib/libdiff/diff/GNUmakefile
+++ b/contrib/libdiff/diff/GNUmakefile
diff --cc contrib/libdiff/diff/Makefile
index 000000000000,4a7f3a9755f5..4a7f3a9755f5
mode 000000,100644..100644
--- a/contrib/libdiff/diff/Makefile
+++ b/contrib/libdiff/diff/Makefile
diff --cc contrib/libdiff/diff/diff.c
index 000000000000,eded4163df8d..eded4163df8d
mode 000000,100644..100644
--- a/contrib/libdiff/diff/diff.c
+++ b/contrib/libdiff/diff/diff.c
diff --cc contrib/libdiff/include/arraylist.h
index 000000000000,453b71cedd7f..453b71cedd7f
mode 000000,100644..100644
--- a/contrib/libdiff/include/arraylist.h
+++ b/contrib/libdiff/include/arraylist.h
diff --cc contrib/libdiff/include/diff_main.h
index 000000000000,04a6c6e748c9..04a6c6e748c9
mode 000000,100644..100644
--- a/contrib/libdiff/include/diff_main.h
+++ b/contrib/libdiff/include/diff_main.h
diff --cc contrib/libdiff/include/diff_output.h
index 000000000000,d2568c5a2b50..d2568c5a2b50
mode 000000,100644..100644
--- a/contrib/libdiff/include/diff_output.h
+++ b/contrib/libdiff/include/diff_output.h
diff --cc contrib/libdiff/lib/GNUmakefile
index 000000000000,cb35f757e09d..cb35f757e09d
mode 000000,100644..100644
--- a/contrib/libdiff/lib/GNUmakefile
+++ b/contrib/libdiff/lib/GNUmakefile
diff --cc contrib/libdiff/lib/diff_atomize_text.c
index 000000000000,32023105af94..32023105af94
mode 000000,100644..100644
--- a/contrib/libdiff/lib/diff_atomize_text.c
+++ b/contrib/libdiff/lib/diff_atomize_text.c
diff --cc contrib/libdiff/lib/diff_debug.h
index 000000000000,4b7ec8090638..4b7ec8090638
mode 000000,100644..100644
--- a/contrib/libdiff/lib/diff_debug.h
+++ b/contrib/libdiff/lib/diff_debug.h
diff --cc contrib/libdiff/lib/diff_internal.h
index 000000000000,46bbadf3cb64..46bbadf3cb64
mode 000000,100644..100644
--- a/contrib/libdiff/lib/diff_internal.h
+++ b/contrib/libdiff/lib/diff_internal.h
diff --cc contrib/libdiff/lib/diff_main.c
index 000000000000,e64b1320e553..e64b1320e553
mode 000000,100644..100644
--- a/contrib/libdiff/lib/diff_main.c
+++ b/contrib/libdiff/lib/diff_main.c
diff --cc contrib/libdiff/lib/diff_myers.c
index 000000000000,c886d1a28586..c886d1a28586
mode 000000,100644..100644
--- a/contrib/libdiff/lib/diff_myers.c
+++ b/contrib/libdiff/lib/diff_myers.c
diff --cc contrib/libdiff/lib/diff_output.c
index 000000000000,7ac63bb6c433..7ac63bb6c433
mode 000000,100644..100644
--- a/contrib/libdiff/lib/diff_output.c
+++ b/contrib/libdiff/lib/diff_output.c
diff --cc contrib/libdiff/lib/diff_output_edscript.c
index 000000000000,42d4d5b39ef5..42d4d5b39ef5
mode 000000,100644..100644
--- a/contrib/libdiff/lib/diff_output_edscript.c
+++ b/contrib/libdiff/lib/diff_output_edscript.c
diff --cc contrib/libdiff/lib/diff_output_plain.c
index 000000000000,7b0082bd1b84..7b0082bd1b84
mode 000000,100644..100644
--- a/contrib/libdiff/lib/diff_output_plain.c
+++ b/contrib/libdiff/lib/diff_output_plain.c
diff --cc contrib/libdiff/lib/diff_output_unidiff.c
index 000000000000,d480a022a9a7..d480a022a9a7
mode 000000,100644..100644
--- a/contrib/libdiff/lib/diff_output_unidiff.c
+++ b/contrib/libdiff/lib/diff_output_unidiff.c
diff --cc contrib/libdiff/lib/diff_patience.c
index 000000000000,a06df2c36c9d..a06df2c36c9d
mode 000000,100644..100644
--- a/contrib/libdiff/lib/diff_patience.c
+++ b/contrib/libdiff/lib/diff_patience.c
diff --cc contrib/libdiff/man/diff.1
index 000000000000,b4a9acb0cdc7..b4a9acb0cdc7
mode 000000,100644..100644
--- a/contrib/libdiff/man/diff.1
+++ b/contrib/libdiff/man/diff.1
diff --cc contrib/libdiff/test/GNUmakefile
index 000000000000,c88d884448ed..c88d884448ed
mode 000000,100644..100644
--- a/contrib/libdiff/test/GNUmakefile
+++ b/contrib/libdiff/test/GNUmakefile
diff --cc contrib/libdiff/test/Makefile
index 000000000000,f42511784ccd..f42511784ccd
mode 000000,100644..100644
--- a/contrib/libdiff/test/Makefile
+++ b/contrib/libdiff/test/Makefile
diff --cc contrib/libdiff/test/README
index 000000000000,60764f106146..60764f106146
mode 000000,100644..100644
--- a/contrib/libdiff/test/README
+++ b/contrib/libdiff/test/README
diff --cc contrib/libdiff/test/arraylist_test.c
index 000000000000,da5542e8d629..da5542e8d629
mode 000000,100644..100644
--- a/contrib/libdiff/test/arraylist_test.c
+++ b/contrib/libdiff/test/arraylist_test.c
diff --cc contrib/libdiff/test/arraylist_test/GNUmakefile
index 000000000000,9f781ee997b3..9f781ee997b3
mode 000000,100644..100644
--- a/contrib/libdiff/test/arraylist_test/GNUmakefile
+++ b/contrib/libdiff/test/arraylist_test/GNUmakefile
diff --cc contrib/libdiff/test/arraylist_test/Makefile
index 000000000000,f088f4767c92..f088f4767c92
mode 000000,100644..100644
--- a/contrib/libdiff/test/arraylist_test/Makefile
+++ b/contrib/libdiff/test/arraylist_test/Makefile
diff --cc contrib/libdiff/test/expect.arraylist_test
index 000000000000,6b255ecbe78e..6b255ecbe78e
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect.arraylist_test
+++ b/contrib/libdiff/test/expect.arraylist_test
diff --cc contrib/libdiff/test/expect.results_test
index 000000000000,93755ac42bd2..93755ac42bd2
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect.results_test
+++ b/contrib/libdiff/test/expect.results_test
diff --cc contrib/libdiff/test/expect001.diff
index 000000000000,7dd803c57dde..7dd803c57dde
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect001.diff
+++ b/contrib/libdiff/test/expect001.diff
diff --cc contrib/libdiff/test/expect002.diff
index 000000000000,d6c64921df76..d6c64921df76
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect002.diff
+++ b/contrib/libdiff/test/expect002.diff
diff --cc contrib/libdiff/test/expect003.diff
index 000000000000,1694445da790..1694445da790
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect003.diff
+++ b/contrib/libdiff/test/expect003.diff
diff --cc contrib/libdiff/test/expect004.diff
index 000000000000,061a76ad650b..061a76ad650b
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect004.diff
+++ b/contrib/libdiff/test/expect004.diff
diff --cc contrib/libdiff/test/expect005.diff
index 000000000000,9ce014a67eb6..9ce014a67eb6
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect005.diff
+++ b/contrib/libdiff/test/expect005.diff
diff --cc contrib/libdiff/test/expect006.diff
index 000000000000,70233e0337e1..70233e0337e1
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect006.diff
+++ b/contrib/libdiff/test/expect006.diff
diff --cc contrib/libdiff/test/expect007.diff
index 000000000000,a6a06181d840..a6a06181d840
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect007.diff
+++ b/contrib/libdiff/test/expect007.diff
diff --cc contrib/libdiff/test/expect008.diff
index 000000000000,c4dc6791528b..c4dc6791528b
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect008.diff
+++ b/contrib/libdiff/test/expect008.diff
diff --cc contrib/libdiff/test/expect009.diff
index 000000000000,c2dae93ed893..c2dae93ed893
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect009.diff
+++ b/contrib/libdiff/test/expect009.diff
diff --cc contrib/libdiff/test/expect010.diff
index 000000000000,868a057dec4d..868a057dec4d
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect010.diff
+++ b/contrib/libdiff/test/expect010.diff
diff --cc contrib/libdiff/test/expect011.diff
index 000000000000,7ad8f311b3e6..7ad8f311b3e6
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect011.diff
+++ b/contrib/libdiff/test/expect011.diff
diff --cc contrib/libdiff/test/expect012.diff
index 000000000000,e9a704b8c534..e9a704b8c534
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect012.diff
+++ b/contrib/libdiff/test/expect012.diff
diff --cc contrib/libdiff/test/expect013.diff
index 000000000000,139970c971d6..139970c971d6
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect013.diff
+++ b/contrib/libdiff/test/expect013.diff
diff --cc contrib/libdiff/test/expect014.diff
index 000000000000,43af317b26f1..43af317b26f1
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect014.diff
+++ b/contrib/libdiff/test/expect014.diff
diff --cc contrib/libdiff/test/expect015.diff
index 000000000000,fd5d0482ba38..fd5d0482ba38
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect015.diff
+++ b/contrib/libdiff/test/expect015.diff
diff --cc contrib/libdiff/test/expect016.diff
index 000000000000,17299d578095..17299d578095
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect016.diff
+++ b/contrib/libdiff/test/expect016.diff
diff --cc contrib/libdiff/test/expect018.diff
index 000000000000,c948e6210e5c..c948e6210e5c
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect018.diff
+++ b/contrib/libdiff/test/expect018.diff
diff --cc contrib/libdiff/test/expect019.diff
index 000000000000,ee242a032fca..ee242a032fca
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect019.diff
+++ b/contrib/libdiff/test/expect019.diff
diff --cc contrib/libdiff/test/expect021.diff
index 000000000000,076ccd4d4a2d..076ccd4d4a2d
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect021.diff
+++ b/contrib/libdiff/test/expect021.diff
diff --cc contrib/libdiff/test/expect101.diff
index 000000000000,eca02621faf8..eca02621faf8
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect101.diff
+++ b/contrib/libdiff/test/expect101.diff
diff --cc contrib/libdiff/test/expect102.diff
index 000000000000,58ec6b7744c8..58ec6b7744c8
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect102.diff
+++ b/contrib/libdiff/test/expect102.diff
diff --cc contrib/libdiff/test/expect103.diff
index 000000000000,dae017d8028e..dae017d8028e
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect103.diff
+++ b/contrib/libdiff/test/expect103.diff
diff --cc contrib/libdiff/test/expect104.diff
index 000000000000,c48183f5fa9c..c48183f5fa9c
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect104.diff
+++ b/contrib/libdiff/test/expect104.diff
diff --cc contrib/libdiff/test/expect105.diff
index 000000000000,82d3b52ee97e..82d3b52ee97e
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect105.diff
+++ b/contrib/libdiff/test/expect105.diff
diff --cc contrib/libdiff/test/expect106.diff
index 000000000000,c48cf3199188..c48cf3199188
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect106.diff
+++ b/contrib/libdiff/test/expect106.diff
diff --cc contrib/libdiff/test/expect107.diff
index 000000000000,f658b89fd21e..f658b89fd21e
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect107.diff
+++ b/contrib/libdiff/test/expect107.diff
diff --cc contrib/libdiff/test/expect108.diff
index 000000000000,a9b93e784e4e..a9b93e784e4e
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect108.diff
+++ b/contrib/libdiff/test/expect108.diff
diff --cc contrib/libdiff/test/expect109.diff
index 000000000000,ee94eff22a3e..ee94eff22a3e
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect109.diff
+++ b/contrib/libdiff/test/expect109.diff
diff --cc contrib/libdiff/test/expect110.diff
index 000000000000,40e1d155b0f2..40e1d155b0f2
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect110.diff
+++ b/contrib/libdiff/test/expect110.diff
diff --cc contrib/libdiff/test/expect111.diff
index 000000000000,dd53220bf3cc..dd53220bf3cc
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect111.diff
+++ b/contrib/libdiff/test/expect111.diff
diff --cc contrib/libdiff/test/expect112.diff
index 000000000000,680fe1ac37c5..680fe1ac37c5
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect112.diff
+++ b/contrib/libdiff/test/expect112.diff
diff --cc contrib/libdiff/test/expect113.diff
index 000000000000,882171f0cbb5..882171f0cbb5
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect113.diff
+++ b/contrib/libdiff/test/expect113.diff
diff --cc contrib/libdiff/test/expect114.diff
index 000000000000,538b475acd17..538b475acd17
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect114.diff
+++ b/contrib/libdiff/test/expect114.diff
diff --cc contrib/libdiff/test/expect115.diff
index 000000000000,64d4f35f2582..64d4f35f2582
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect115.diff
+++ b/contrib/libdiff/test/expect115.diff
diff --cc contrib/libdiff/test/expect116.diff
index 000000000000,35c3a14b2f70..35c3a14b2f70
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect116.diff
+++ b/contrib/libdiff/test/expect116.diff
diff --cc contrib/libdiff/test/expect117.diff
index 000000000000,63df381db814..63df381db814
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect117.diff
+++ b/contrib/libdiff/test/expect117.diff
diff --cc contrib/libdiff/test/expect123.diff
index 000000000000,77d05518ee95..77d05518ee95
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect123.diff
+++ b/contrib/libdiff/test/expect123.diff
diff --cc contrib/libdiff/test/expect124.diff
index 000000000000,82713c206aff..82713c206aff
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect124.diff
+++ b/contrib/libdiff/test/expect124.diff
diff --cc contrib/libdiff/test/expect125.diff
index 000000000000,dc9ca80aa498..dc9ca80aa498
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect125.diff
+++ b/contrib/libdiff/test/expect125.diff
diff --cc contrib/libdiff/test/expect126.diff
index 000000000000,ddf0066b6822..ddf0066b6822
mode 000000,100644..100644
--- a/contrib/libdiff/test/expect126.diff
+++ b/contrib/libdiff/test/expect126.diff
diff --cc contrib/libdiff/test/results_test.c
index 000000000000,02856a39c249..02856a39c249
mode 000000,100644..100644
--- a/contrib/libdiff/test/results_test.c
+++ b/contrib/libdiff/test/results_test.c
diff --cc contrib/libdiff/test/results_test/GNUmakefile
index 000000000000,f5b14b1f6648..f5b14b1f6648
mode 000000,100644..100644
--- a/contrib/libdiff/test/results_test/GNUmakefile
+++ b/contrib/libdiff/test/results_test/GNUmakefile
diff --cc contrib/libdiff/test/results_test/Makefile
index 000000000000,4cb496ada0aa..4cb496ada0aa
mode 000000,100644..100644
--- a/contrib/libdiff/test/results_test/Makefile
+++ b/contrib/libdiff/test/results_test/Makefile
diff --cc contrib/libdiff/test/test001.left.txt
index 000000000000,fd113b0f7150..fd113b0f7150
mode 000000,100644..100644
--- a/contrib/libdiff/test/test001.left.txt
+++ b/contrib/libdiff/test/test001.left.txt
diff --cc contrib/libdiff/test/test001.right.txt
index 000000000000,0075e6d23de0..0075e6d23de0
mode 000000,100644..100644
--- a/contrib/libdiff/test/test001.right.txt
+++ b/contrib/libdiff/test/test001.right.txt
diff --cc contrib/libdiff/test/test002.left.txt
index 000000000000,de77f56f2d47..de77f56f2d47
mode 000000,100644..100644
--- a/contrib/libdiff/test/test002.left.txt
+++ b/contrib/libdiff/test/test002.left.txt
diff --cc contrib/libdiff/test/test002.right.txt
index 000000000000,a9b4b8b851dd..a9b4b8b851dd
mode 000000,100644..100644
--- a/contrib/libdiff/test/test002.right.txt
+++ b/contrib/libdiff/test/test002.right.txt
diff --cc contrib/libdiff/test/test003.left.txt
index 000000000000,940532533944..940532533944
mode 000000,100644..100644
--- a/contrib/libdiff/test/test003.left.txt
+++ b/contrib/libdiff/test/test003.left.txt
diff --cc contrib/libdiff/test/test003.right.txt
index 000000000000,d9f266e14574..d9f266e14574
mode 000000,100644..100644
--- a/contrib/libdiff/test/test003.right.txt
+++ b/contrib/libdiff/test/test003.right.txt
diff --cc contrib/libdiff/test/test004.left.txt
index 000000000000,72d95cf6331a..72d95cf6331a
mode 000000,100644..100644
--- a/contrib/libdiff/test/test004.left.txt
+++ b/contrib/libdiff/test/test004.left.txt
diff --cc contrib/libdiff/test/test004.right.txt
index 000000000000,cfe8f2ed6be0..cfe8f2ed6be0
mode 000000,100644..100644
--- a/contrib/libdiff/test/test004.right.txt
+++ b/contrib/libdiff/test/test004.right.txt
diff --cc contrib/libdiff/test/test005.left.txt
index 000000000000,b77fc41c4c87..b77fc41c4c87
mode 000000,100644..100644
--- a/contrib/libdiff/test/test005.left.txt
+++ b/contrib/libdiff/test/test005.left.txt
diff --cc contrib/libdiff/test/test005.right.txt
index 000000000000,2480cecfba48..2480cecfba48
mode 000000,100644..100644
--- a/contrib/libdiff/test/test005.right.txt
+++ b/contrib/libdiff/test/test005.right.txt
diff --cc contrib/libdiff/test/test006.left.txt
index 000000000000,e01fce04d5ef..e01fce04d5ef
mode 000000,100644..100644
--- a/contrib/libdiff/test/test006.left.txt
+++ b/contrib/libdiff/test/test006.left.txt
diff --cc contrib/libdiff/test/test006.right.txt
index 000000000000,40a0f253dd2e..40a0f253dd2e
mode 000000,100644..100644
--- a/contrib/libdiff/test/test006.right.txt
+++ b/contrib/libdiff/test/test006.right.txt
diff --cc contrib/libdiff/test/test007.left.txt
index 000000000000,587be6b4c3f9..587be6b4c3f9
mode 000000,100644..100644
--- a/contrib/libdiff/test/test007.left.txt
+++ b/contrib/libdiff/test/test007.left.txt
diff --cc contrib/libdiff/test/test007.right.txt
index 000000000000,47b0ccb04734..47b0ccb04734
mode 000000,100644..100644
--- a/contrib/libdiff/test/test007.right.txt
+++ b/contrib/libdiff/test/test007.right.txt
diff --cc contrib/libdiff/test/test008.left.txt
index 000000000000,587be6b4c3f9..587be6b4c3f9
mode 000000,100644..100644
--- a/contrib/libdiff/test/test008.left.txt
+++ b/contrib/libdiff/test/test008.left.txt
diff --cc contrib/libdiff/test/test008.right.txt
index 000000000000,70b67eef4500..70b67eef4500
mode 000000,100644..100644
--- a/contrib/libdiff/test/test008.right.txt
+++ b/contrib/libdiff/test/test008.right.txt
diff --cc contrib/libdiff/test/test009.left.txt
index 000000000000,e4e5238f8e5d..e4e5238f8e5d
mode 000000,100644..100644
--- a/contrib/libdiff/test/test009.left.txt
+++ b/contrib/libdiff/test/test009.left.txt
diff --cc contrib/libdiff/test/test009.right.txt
index 000000000000,3a4386800dba..3a4386800dba
mode 000000,100644..100644
--- a/contrib/libdiff/test/test009.right.txt
+++ b/contrib/libdiff/test/test009.right.txt
diff --cc contrib/libdiff/test/test010.left.txt
index 000000000000,f68ae6a8ceaa..f68ae6a8ceaa
mode 000000,100644..100644
--- a/contrib/libdiff/test/test010.left.txt
+++ b/contrib/libdiff/test/test010.left.txt
diff --cc contrib/libdiff/test/test010.right.txt
index 000000000000,46844afad663..46844afad663
mode 000000,100644..100644
--- a/contrib/libdiff/test/test010.right.txt
+++ b/contrib/libdiff/test/test010.right.txt
diff --cc contrib/libdiff/test/test011.left.txt
index 000000000000,2fbc5affa850..2fbc5affa850
mode 000000,100644..100644
--- a/contrib/libdiff/test/test011.left.txt
+++ b/contrib/libdiff/test/test011.left.txt
diff --cc contrib/libdiff/test/test011.right.txt
index 000000000000,417db010011c..417db010011c
mode 000000,100644..100644
--- a/contrib/libdiff/test/test011.right.txt
+++ b/contrib/libdiff/test/test011.right.txt
diff --cc contrib/libdiff/test/test012.left.txt
index 000000000000,1081d16c6e49..1081d16c6e49
mode 000000,100644..100644
--- a/contrib/libdiff/test/test012.left.txt
+++ b/contrib/libdiff/test/test012.left.txt
diff --cc contrib/libdiff/test/test012.right.txt
index 000000000000,dee7f5e68de3..dee7f5e68de3
mode 000000,100644..100644
--- a/contrib/libdiff/test/test012.right.txt
+++ b/contrib/libdiff/test/test012.right.txt
diff --cc contrib/libdiff/test/test013.left-w.txt
index 000000000000,53b3adf33dac..53b3adf33dac
mode 000000,100644..100644
--- a/contrib/libdiff/test/test013.left-w.txt
+++ b/contrib/libdiff/test/test013.left-w.txt
diff --cc contrib/libdiff/test/test013.right-w.txt
index 000000000000,1509b4b4fdfa..1509b4b4fdfa
mode 000000,100644..100644
--- a/contrib/libdiff/test/test013.right-w.txt
+++ b/contrib/libdiff/test/test013.right-w.txt
diff --cc contrib/libdiff/test/test014.left.txt
index 000000000000,000000000000..e69de29bb2d1
new file mode 100644
--- /dev/null
+++ b/contrib/libdiff/test/test014.left.txt
diff --cc contrib/libdiff/test/test014.right.txt
index 000000000000,f70f10e4db19..f70f10e4db19
mode 000000,100644..100644
--- a/contrib/libdiff/test/test014.right.txt
+++ b/contrib/libdiff/test/test014.right.txt
diff --cc contrib/libdiff/test/test015.left.txt
index 000000000000,f70f10e4db19..f70f10e4db19
mode 000000,100644..100644
--- a/contrib/libdiff/test/test015.left.txt
+++ b/contrib/libdiff/test/test015.left.txt
diff --cc contrib/libdiff/test/test015.right.txt
index 000000000000,000000000000..e69de29bb2d1
new file mode 100644
--- /dev/null
+++ b/contrib/libdiff/test/test015.right.txt
diff --cc contrib/libdiff/test/test016.left.txt
index 000000000000,9a6e925fd9fb..9a6e925fd9fb
mode 000000,100644..100644
--- a/contrib/libdiff/test/test016.left.txt
+++ b/contrib/libdiff/test/test016.left.txt
diff --cc contrib/libdiff/test/test016.right.txt
index 000000000000,005c3dbd02ea..005c3dbd02ea
mode 000000,100644..100644
--- a/contrib/libdiff/test/test016.right.txt
+++ b/contrib/libdiff/test/test016.right.txt
diff --cc contrib/libdiff/test/test017.left-U0.txt
index 000000000000,e622c0db8bdf..e622c0db8bdf
mode 000000,100644..100644
--- a/contrib/libdiff/test/test017.left-U0.txt
+++ b/contrib/libdiff/test/test017.left-U0.txt
diff --cc contrib/libdiff/test/test017.right-U0.txt
index 000000000000,9495dcd762b8..9495dcd762b8
mode 000000,100644..100644
--- a/contrib/libdiff/test/test017.right-U0.txt
+++ b/contrib/libdiff/test/test017.right-U0.txt
diff --cc contrib/libdiff/test/test018.left-T.txt
index 000000000000,fd113b0f7150..fd113b0f7150
mode 000000,100644..100644
--- a/contrib/libdiff/test/test018.left-T.txt
+++ b/contrib/libdiff/test/test018.left-T.txt
diff --cc contrib/libdiff/test/test018.right-T.txt
index 000000000000,0075e6d23de0..0075e6d23de0
mode 000000,100644..100644
--- a/contrib/libdiff/test/test018.right-T.txt
+++ b/contrib/libdiff/test/test018.right-T.txt
diff --cc contrib/libdiff/test/test019.left.txt
index 000000000000,ac4b5ececbb3..ac4b5ececbb3
mode 000000,100644..100644
--- a/contrib/libdiff/test/test019.left.txt
+++ b/contrib/libdiff/test/test019.left.txt
diff --cc contrib/libdiff/test/test019.right.txt
index 000000000000,69c2895af058..69c2895af058
mode 000000,100644..100644
--- a/contrib/libdiff/test/test019.right.txt
+++ b/contrib/libdiff/test/test019.right.txt
diff --cc contrib/libdiff/test/test020.left.txt
index 000000000000,7e5ee06994a5..7e5ee06994a5
mode 000000,100644..100644
--- a/contrib/libdiff/test/test020.left.txt
+++ b/contrib/libdiff/test/test020.left.txt
diff --cc contrib/libdiff/test/test020.right.txt
index 000000000000,9ed331be5c5b..9ed331be5c5b
mode 000000,100644..100644
--- a/contrib/libdiff/test/test020.right.txt
+++ b/contrib/libdiff/test/test020.right.txt
diff --cc contrib/libdiff/test/test021.left.txt
index 000000000000,952d28523094..952d28523094
mode 000000,100644..100644
--- a/contrib/libdiff/test/test021.left.txt
+++ b/contrib/libdiff/test/test021.left.txt
diff --cc contrib/libdiff/test/test021.right.txt
index 000000000000,7e2cc400cddb..7e2cc400cddb
mode 000000,100644..100644
--- a/contrib/libdiff/test/test021.right.txt
+++ b/contrib/libdiff/test/test021.right.txt
diff --cc contrib/libdiff/test/test101.left-P.txt
index 000000000000,fd113b0f7150..fd113b0f7150
mode 000000,100644..100644
--- a/contrib/libdiff/test/test101.left-P.txt
+++ b/contrib/libdiff/test/test101.left-P.txt
diff --cc contrib/libdiff/test/test101.right-P.txt
index 000000000000,0075e6d23de0..0075e6d23de0
mode 000000,100644..100644
--- a/contrib/libdiff/test/test101.right-P.txt
+++ b/contrib/libdiff/test/test101.right-P.txt
diff --cc contrib/libdiff/test/test102.left-P.txt
index 000000000000,de77f56f2d47..de77f56f2d47
mode 000000,100644..100644
--- a/contrib/libdiff/test/test102.left-P.txt
+++ b/contrib/libdiff/test/test102.left-P.txt
diff --cc contrib/libdiff/test/test102.right-P.txt
index 000000000000,a9b4b8b851dd..a9b4b8b851dd
mode 000000,100644..100644
--- a/contrib/libdiff/test/test102.right-P.txt
+++ b/contrib/libdiff/test/test102.right-P.txt
diff --cc contrib/libdiff/test/test103.left-P.txt
index 000000000000,940532533944..940532533944
mode 000000,100644..100644
--- a/contrib/libdiff/test/test103.left-P.txt
+++ b/contrib/libdiff/test/test103.left-P.txt
diff --cc contrib/libdiff/test/test103.right-P.txt
index 000000000000,d9f266e14574..d9f266e14574
mode 000000,100644..100644
--- a/contrib/libdiff/test/test103.right-P.txt
+++ b/contrib/libdiff/test/test103.right-P.txt
diff --cc contrib/libdiff/test/test104.left-P.txt
index 000000000000,72d95cf6331a..72d95cf6331a
mode 000000,100644..100644
--- a/contrib/libdiff/test/test104.left-P.txt
+++ b/contrib/libdiff/test/test104.left-P.txt
diff --cc contrib/libdiff/test/test104.right-P.txt
index 000000000000,cfe8f2ed6be0..cfe8f2ed6be0
mode 000000,100644..100644
--- a/contrib/libdiff/test/test104.right-P.txt
+++ b/contrib/libdiff/test/test104.right-P.txt
diff --cc contrib/libdiff/test/test105.left-P.txt
index 000000000000,b77fc41c4c87..b77fc41c4c87
mode 000000,100644..100644
--- a/contrib/libdiff/test/test105.left-P.txt
+++ b/contrib/libdiff/test/test105.left-P.txt
diff --cc contrib/libdiff/test/test105.right-P.txt
index 000000000000,2480cecfba48..2480cecfba48
mode 000000,100644..100644
--- a/contrib/libdiff/test/test105.right-P.txt
+++ b/contrib/libdiff/test/test105.right-P.txt
diff --cc contrib/libdiff/test/test106.left-P.txt
index 000000000000,e01fce04d5ef..e01fce04d5ef
mode 000000,100644..100644
--- a/contrib/libdiff/test/test106.left-P.txt
+++ b/contrib/libdiff/test/test106.left-P.txt
diff --cc contrib/libdiff/test/test106.right-P.txt
index 000000000000,40a0f253dd2e..40a0f253dd2e
mode 000000,100644..100644
--- a/contrib/libdiff/test/test106.right-P.txt
+++ b/contrib/libdiff/test/test106.right-P.txt
diff --cc contrib/libdiff/test/test107.left-P.txt
index 000000000000,587be6b4c3f9..587be6b4c3f9
mode 000000,100644..100644
--- a/contrib/libdiff/test/test107.left-P.txt
+++ b/contrib/libdiff/test/test107.left-P.txt
diff --cc contrib/libdiff/test/test107.right-P.txt
index 000000000000,47b0ccb04734..47b0ccb04734
mode 000000,100644..100644
--- a/contrib/libdiff/test/test107.right-P.txt
+++ b/contrib/libdiff/test/test107.right-P.txt
diff --cc contrib/libdiff/test/test108.left-P.txt
index 000000000000,000000000000..587be6b4c3f9
new file mode 100644
--- /dev/null
+++ b/contrib/libdiff/test/test108.left-P.txt
@@@ -1,0 -1,0 +1,1 @@@
++x
diff --cc contrib/libdiff/test/test108.right-P.txt
index 000000000000,70b67eef4500..70b67eef4500
mode 000000,100644..100644
--- a/contrib/libdiff/test/test108.right-P.txt
+++ b/contrib/libdiff/test/test108.right-P.txt
diff --cc contrib/libdiff/test/test109.left-P.txt
index 000000000000,e4e5238f8e5d..e4e5238f8e5d
mode 000000,100644..100644
--- a/contrib/libdiff/test/test109.left-P.txt
+++ b/contrib/libdiff/test/test109.left-P.txt
diff --cc contrib/libdiff/test/test109.right-P.txt
index 000000000000,3a4386800dba..3a4386800dba
mode 000000,100644..100644
--- a/contrib/libdiff/test/test109.right-P.txt
+++ b/contrib/libdiff/test/test109.right-P.txt
diff --cc contrib/libdiff/test/test110.left-P.txt
index 000000000000,f68ae6a8ceaa..f68ae6a8ceaa
mode 000000,100644..100644
--- a/contrib/libdiff/test/test110.left-P.txt
+++ b/contrib/libdiff/test/test110.left-P.txt
diff --cc contrib/libdiff/test/test110.right-P.txt
index 000000000000,46844afad663..46844afad663
mode 000000,100644..100644
--- a/contrib/libdiff/test/test110.right-P.txt
+++ b/contrib/libdiff/test/test110.right-P.txt
diff --cc contrib/libdiff/test/test111.left-P.txt
index 000000000000,2fbc5affa850..2fbc5affa850
mode 000000,100644..100644
--- a/contrib/libdiff/test/test111.left-P.txt
+++ b/contrib/libdiff/test/test111.left-P.txt
diff --cc contrib/libdiff/test/test111.right-P.txt
index 000000000000,417db010011c..417db010011c
mode 000000,100644..100644
--- a/contrib/libdiff/test/test111.right-P.txt
+++ b/contrib/libdiff/test/test111.right-P.txt
diff --cc contrib/libdiff/test/test112.left-P.txt
index 000000000000,1081d16c6e49..1081d16c6e49
mode 000000,100644..100644
--- a/contrib/libdiff/test/test112.left-P.txt
+++ b/contrib/libdiff/test/test112.left-P.txt
diff --cc contrib/libdiff/test/test112.right-P.txt
index 000000000000,dee7f5e68de3..dee7f5e68de3
mode 000000,100644..100644
--- a/contrib/libdiff/test/test112.right-P.txt
+++ b/contrib/libdiff/test/test112.right-P.txt
diff --cc contrib/libdiff/test/test113.left-Pw.txt
index 000000000000,53b3adf33dac..53b3adf33dac
mode 000000,100644..100644
--- a/contrib/libdiff/test/test113.left-Pw.txt
+++ b/contrib/libdiff/test/test113.left-Pw.txt
diff --cc contrib/libdiff/test/test113.right-Pw.txt
index 000000000000,1509b4b4fdfa..1509b4b4fdfa
mode 000000,100644..100644
--- a/contrib/libdiff/test/test113.right-Pw.txt
+++ b/contrib/libdiff/test/test113.right-Pw.txt
diff --cc contrib/libdiff/test/test114.left-P.txt
index 000000000000,000000000000..e69de29bb2d1
new file mode 100644
--- /dev/null
+++ b/contrib/libdiff/test/test114.left-P.txt
diff --cc contrib/libdiff/test/test114.right-P.txt
index 000000000000,f70f10e4db19..f70f10e4db19
mode 000000,100644..100644
--- a/contrib/libdiff/test/test114.right-P.txt
+++ b/contrib/libdiff/test/test114.right-P.txt
diff --cc contrib/libdiff/test/test115.left-P.txt
index 000000000000,f70f10e4db19..f70f10e4db19
mode 000000,100644..100644
--- a/contrib/libdiff/test/test115.left-P.txt
+++ b/contrib/libdiff/test/test115.left-P.txt
diff --cc contrib/libdiff/test/test115.right-P.txt
index 000000000000,000000000000..e69de29bb2d1
new file mode 100644
--- /dev/null
+++ b/contrib/libdiff/test/test115.right-P.txt
diff --cc contrib/libdiff/test/test116.left-P.txt
index 000000000000,9a6e925fd9fb..9a6e925fd9fb
mode 000000,100644..100644
--- a/contrib/libdiff/test/test116.left-P.txt
+++ b/contrib/libdiff/test/test116.left-P.txt
diff --cc contrib/libdiff/test/test116.right-P.txt
index 000000000000,005c3dbd02ea..005c3dbd02ea
mode 000000,100644..100644
--- a/contrib/libdiff/test/test116.right-P.txt
*** 66 LINES SKIPPED ***