From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 19 Oct 2019 16:37:53 +0000 (+0200)
Subject: patch 8.1.2182: test42 seen as binary by git diff
X-Git-Tag: v8.1.2182
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b39d7adb0b9f02afe242f607d4c96250f06965d;p=vim

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)
---

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..9216dbe8d
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+src/testdir/test42.in diff
diff --git a/Filelist b/Filelist
index e79cbb791..a2b9f0adb 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 c35569a76..1d9d3ab92 100644
Binary files a/src/testdir/test42.in and b/src/testdir/test42.in differ
diff --git a/src/version.c b/src/version.c
index 0fff97d46..afdc49aeb 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,
 /**/