Commit e43520660c6dba6470af28ce3be822be401f5788
2015-09-28T18:25:24
merge_file: treat large files as binary xdiff craps the bed on large files. Treat very large files as binary, so that it doesn't even have to try. Refactor our merge binary handling to better match git.git, which looks for a NUL in the first 8000 bytes.