# HG changeset patch # User Bram Moolenaar # Date 1571503503 -7200 # Node ID ccc02b39fb5edb0eca5e8ffb56c07da23ba3dc02 # Parent c25f7b1dc823696f274646e0b037ab0efc90f4ea patch 8.1.2182: test42 seen as binary by git diff Commit: https://github.com/vim/vim/commit/5b39d7adb0b9f02afe242f607d4c96250f06965d Author: Bram Moolenaar 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) diff --git a/.gitattributes b/.gitattributes new file mode 100644 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,1 @@ +src/testdir/test42.in diff diff --git a/Filelist b/Filelist --- 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 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&$Ulg8ZDmHvd!pJx%p@;jAFGFas4E&a+;Xr4BVXQ_ngEXr?Cf|_B8R&VCwdSo_ob$0Ic z+u-{?e5C!M@ls~XpJMS|5dQErGER{J_@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;>;mTxkbO`WQURwcOXyjvPB!fA+6JnU#ikI-aI35S17OBp#j6W%3!9Ia)5QRMyz zzLRU!4?QUJetFLpY|13_S-?D-clXOinK3L4p~o1xGn&B2%E->hgRzia&mP77a=e^p4 diff --git a/src/version.c b/src/version.c --- 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,