---- grep-2.23/tests/Makefile.am~ 2016-01-03 20:53:59.000000000 +0100
-+++ grep-2.23/tests/Makefile.am 2016-02-27 19:47:27.625473158 +0100
-@@ -30,6 +30,9 @@
+diff -urNp -x '*.orig' grep-3.6.org/gnulib-tests/gnulib.mk grep-3.6/gnulib-tests/gnulib.mk
+--- grep-3.6.org/gnulib-tests/gnulib.mk 2020-11-01 18:25:08.000000000 +0100
++++ grep-3.6/gnulib-tests/gnulib.mk 2021-03-19 21:13:08.100627234 +0100
+@@ -278,9 +278,9 @@ EXTRA_DIST += test-ctype.c
+
+ ## begin gnulib module dfa-tests
+
++XFAIL_TESTS += test-dfa-invalid-merge.sh
+ TESTS += \
+ test-dfa-invalid-char-class.sh \
+- test-dfa-invalid-merge.sh \
+ test-dfa-match.sh
+
+ check_PROGRAMS += test-dfa-match-aux
+diff -urNp -x '*.orig' grep-3.6.org/tests/Makefile.am grep-3.6/tests/Makefile.am
+--- grep-3.6.org/tests/Makefile.am 2020-11-03 21:37:02.000000000 +0100
++++ grep-3.6/tests/Makefile.am 2021-03-19 21:13:08.100627234 +0100
+@@ -49,6 +49,9 @@ LDADD = ../lib/libgreputils.a $(LIBINTL)
# FIXME-2015: Remove this once the glibc and gnulib bugs are fixed.
XFAIL_TESTS = triple-backref
# Equivalence classes are only supported when using the system
# matcher (which means only with glibc).
# The included matcher needs to be fixed.
-@@ -92,7 +95,6 @@
+@@ -119,7 +122,6 @@ TESTS = \
khadafy \
kwset-abuse \
long-line-vs-2GiB-read \
many-regex-performance \
match-lines \
max-count-overread \
---- grep-3.6/gnulib-tests/gnulib.mk~ 2020-11-01 18:25:08.000000000 +0100
-+++ grep-3.6/gnulib-tests/gnulib.mk 2021-01-03 17:20:28.534114089 +0100
-@@ -278,9 +278,9 @@
-
- ## begin gnulib module dfa-tests
-
-+XFAIL_TESTS += test-dfa-invalid-merge.sh
- TESTS += \
- test-dfa-invalid-char-class.sh \
-- test-dfa-invalid-merge.sh \
- test-dfa-match.sh
-
- check_PROGRAMS += test-dfa-match-aux
---- grep-2.5.4/doc/grep.texi~ 2009-02-11 22:18:48.574650826 +0100
-+++ grep-2.5.4/doc/grep.texi 2009-02-11 22:19:50.404383538 +0100
-@@ -29,9 +29,9 @@
+diff -urNp -x '*.orig' grep-3.6.org/doc/grep.texi grep-3.6/doc/grep.texi
+--- grep-3.6.org/doc/grep.texi 2020-11-03 21:37:02.000000000 +0100
++++ grep-3.6/doc/grep.texi 2021-03-19 21:13:07.105627234 +0100
+@@ -43,9 +43,9 @@ Texts. A copy of the license is include
@end quotation
@end copying
---- grep-3.4/po/pl.po.orig 2020-01-07 20:38:23.152238576 +0100
-+++ grep-3.4/po/pl.po 2020-01-07 20:42:12.480996195 +0100
-@@ -544,7 +544,7 @@
+diff -urNp -x '*.orig' grep-3.6.org/po/pl.po grep-3.6/po/pl.po
+--- grep-3.6.org/po/pl.po 2020-11-09 05:37:13.000000000 +0100
++++ grep-3.6/po/pl.po 2021-03-19 21:13:07.576627234 +0100
+@@ -540,7 +540,7 @@ msgid ""
msgstr ""
" -o, --only-matching pokazanie tylko niepustych części linii, które\n"
" pasują\n"