aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Hahler <git@thequod.de>2019-10-19 20:31:50 +0200
committerJustin M. Keyes <justinkz@gmail.com>2019-10-19 11:31:50 -0700
commit68b0873c458f4a0b5ca8483958994d338060202a (patch)
treef91895a8a90bded13dbf58e576fed0f852c9f582
parent175ca82ca7baec7ce449d9e72f77a8f12d2e50dc (diff)
downloadrneovim-68b0873c458f4a0b5ca8483958994d338060202a.tar.gz
rneovim-68b0873c458f4a0b5ca8483958994d338060202a.tar.bz2
rneovim-68b0873c458f4a0b5ca8483958994d338060202a.zip
vim-patch:8.1.2182: test42 seen as binary by git diff #11256
Problem: Test42 seen as binary by git diff. Solution: Add .gitattributes file. Make explicit that 'cpo' does not contain 'S'. (Daniel Hahler, closes vim/vim#5072) https://github.com/vim/vim/commit/5b39d7adb0b9f02afe242f607d4c96250f06965d
-rwxr-xr-x.gitattributes1
-rw-r--r--src/nvim/testdir/test42.inbin2438 -> 2373 bytes
2 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index 15a5c58091..cb5934a2a1 100755
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
*.h linguist-language=C
+src/nvim/testdir/test42.in diff
diff --git a/src/nvim/testdir/test42.in b/src/nvim/testdir/test42.in
index baa6e67d26..d9057e72fb 100644
--- a/src/nvim/testdir/test42.in
+++ b/src/nvim/testdir/test42.in
Binary files differ