From 5b39d7adb0b9f02afe242f607d4c96250f06965d Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 19 Oct 2019 18:37:53 +0200
Subject: [PATCH] patch 8.1.2182: test42 seen as binary by git diff

Problem:    Test42 seen as binary by git diff.
Solution:   Add .gitattributes file.  Make explicit that 'cpo' does not
            contain 'S'. (Daniel Hahler, closes #5072)
---
 .gitattributes        |   1 +
 Filelist              |   1 +
 src/testdir/test42.in | Bin 2368 -> 2386 bytes
 src/version.c         |   2 ++
 4 files changed, 4 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..9216dbe8db
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+src/testdir/test42.in diff
diff --git a/Filelist b/Filelist
index e79cbb791e..a2b9f0adb7 100644
--- a/Filelist
+++ b/Filelist
@@ -4,6 +4,7 @@
 # source files for all source archives
 SRC_ALL =	\
 		.gitignore \
+		.gitattributes \
 		.hgignore \
 		.lgtm.yml \
 		.travis.yml \
diff --git a/src/testdir/test42.in b/src/testdir/test42.in
index c35569a76c908682eb8e7e7ab8d9a3522d9fa473..1d9d3ab92cd597e8c75fab7763d90cf3906c7da4 100644
GIT binary patch
delta 23
ecmX>gbV+DJ7*BFRenClQeqOP*ZScl`4;%n*BndnK

delta 10
Rcmca4bU<iA*v5=k8~_?b1gHQ2

diff --git a/src/version.c b/src/version.c
index 0fff97d466..afdc49aeb2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2182,
 /**/
     2181,
 /**/