changeset 18376:ccc02b39fb5e v8.1.2182

patch 8.1.2182: test42 seen as binary by git diff Commit: https://github.com/vim/vim/commit/5b39d7adb0b9f02afe242f607d4c96250f06965d Author: Bram Moolenaar <Bram@vim.org> Date: Sat Oct 19 18:37:53 2019 +0200 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)
author Bram Moolenaar <Bram@vim.org>
date Sat, 19 Oct 2019 18:45:03 +0200
parents c25f7b1dc823
children 6c588c9c48ee
files .gitattributes Filelist src/testdir/test42.in src/version.c
diffstat 4 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
new file mode 100644
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,1 @@
+src/testdir/test42.in diff
--- a/Filelist
+++ b/Filelist
@@ -4,6 +4,7 @@
 # source files for all source archives
 SRC_ALL =	\
 		.gitignore \
+		.gitattributes \
 		.hgignore \
 		.lgtm.yml \
 		.travis.yml \
index c35569a76c908682eb8e7e7ab8d9a3522d9fa473..1d9d3ab92cd597e8c75fab7763d90cf3906c7da4
GIT binary patch
literal 2386
zc$~dfUvJYe5chLF057~;%d~+;Hkzdss??#e4GD>L5-ox!q_nxL5orvzOSU(@7Y}?S
zzCp*?i4(7XBp#rt(w^_mzMp@-J9msyLBa(TB2{UA15qA>z$i8{Bx!~qRV0k9NY#v#
zudlB>Z!|u8KOSF>#$I1?m{0B$9(_;eG(rW_ul%b@c`gqJqf&$Ul<PGI3zhgUOPyZa
z>g8ZDmHvd!pJx%p@;jAFGFas4E&a+;Xr4BVXQ_ngEXr?Cf|_B8R&VCwdSo_ob$0Ic
z+u-{?e5C!M@ls~X<SM=X@#iYs-tl3lXu&6Ke4+IQr>pJMS|5dQErGER{J_<o)Y=SP
zeW(!)5o1ssqBtf(hacX7CJ>@Tp)eqarKV(IlIC6??R?nywBhYd&IMM4KqB}YXtFuD
zgCsfd_#^h%ESGcSnb$8Y#d4oi6eALMt81QR880BlBwA$3Fc$_#X|740M~XnflZOYj
z5!oB#ZBEAUu6M5U4J}2XOHjAgJ|wQUN}QSr#F{+$SM2q+vDYfAV21ev)__thsyNjQ
z>dz(?4S^LOZJTrFGn{@QK(u#^tMY;>;mTx<Im-M%QAn%`t42y$C}@^w!Koe|@r7D1
z8=#7rysA9ma(Gd>kbO`WQURwcOXyjvPB!fA+6JnU#ikI-aI35S17OBp#j6W%3!<tW
z<v`^~NB6Wyvka1mz9x~Tom;A(HQ0k4V-Gf9*Dawzbn@R3mGSDfv;|RyPK((ICLOVE
zikne|4W{lcFog}G?iNHYPraRBa(U{lqp}yDG%Zz8|1x!9dWqZqn&tOIQ|eakIC9{~
zCypFCa@UbHsJaKzO|ZY#T${_+bUpI2SBkwz3K!tFsO1q+=HG>9Ia)5QRMyz<pTA0>
zzLRU!4?QUJetFLpY|13_S-?D-clXOinK3L4p~o1xGn&B2%E->hgRzia&mP77a<fB5
HFKWj>=e^p4
--- 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,