summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-10-19 18:37:53 +0200
committerBram Moolenaar <Bram@vim.org>2019-10-19 18:37:53 +0200
commit5b39d7adb0b9f02afe242f607d4c96250f06965d (patch)
treeca61af972fa52f71d8ca2a2d8c2ddaec8c35145e /src
parenta74fda6f4d21d8e0652e9cfa04dd3e041f779f62 (diff)
patch 8.1.2182: test42 seen as binary by git diffv8.1.2182
Problem: Test42 seen as binary by git diff. Solution: Add .gitattributes file. Make explicit that 'cpo' does not contain 'S'. (Daniel Hahler, closes #5072)
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test42.inbin2368 -> 2386 bytes
-rw-r--r--src/version.c2
2 files changed, 2 insertions, 0 deletions
diff --git a/src/testdir/test42.in b/src/testdir/test42.in
index c35569a76c..1d9d3ab92c 100644
--- a/src/testdir/test42.in
+++ b/src/testdir/test42.in
Binary files differ
diff --git a/src/version.c b/src/version.c
index 0fff97d466..afdc49aeb2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2182,
+/**/
2181,
/**/
2180,