diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-10-19 18:37:53 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-10-19 18:37:53 +0200 |
| commit | 5b39d7adb0b9f02afe242f607d4c96250f06965d (patch) | |
| tree | ca61af972fa52f71d8ca2a2d8c2ddaec8c35145e | |
| parent | a74fda6f4d21d8e0652e9cfa04dd3e041f779f62 (diff) | |
| download | vim-git-5b39d7adb0b9f02afe242f607d4c96250f06965d.tar.gz | |
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)
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rw-r--r-- | Filelist | 1 | ||||
| -rw-r--r-- | src/testdir/test42.in | bin | 2368 -> 2386 bytes | |||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 4 insertions, 0 deletions
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 @@ -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 Binary files differindex c35569a76..1d9d3ab92 100644 --- a/src/testdir/test42.in +++ b/src/testdir/test42.in diff --git a/src/version.c b/src/version.c index 0fff97d46..afdc49aeb 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, |