cpython/.gitattributes

Misc/NEWS   merge=union

*.pck binary
Lib/test/cjkencodings/* binary
Lib/test/decimaltestdata/*.decTest binary
Lib/test/sndhdrdata/sndhdr.* binary
Lib/test/test_email/data/msg_26.txt binary
Lib/test/xmltestdata/* binary
Lib/venv/scripts/nt/* binary
Lib/test/coding20731.py binary
Reduce conflict on Misc/NEWS (GH-212) use "union" merge strategy for Misc/NEWS. 2017-02-21 05:17:06 -04:00			`Misc/NEWS merge=union`
mark various test data binary (#233) 2017-02-23 02:38:48 -04:00
			`*.pck binary`
			`Lib/test/cjkencodings/* binary`
			`Lib/test/decimaltestdata/*.decTest binary`
			`Lib/test/sndhdrdata/sndhdr.* binary`
			`Lib/test/test_email/data/msg_26.txt binary`
			`Lib/test/xmltestdata/* binary`
			`Lib/venv/scripts/nt/* binary`
			`Lib/test/coding20731.py binary`