xdiff.h
3.63 KB
-
merge_file: treat large files as binary · 7eb26267
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.
Edward Thomson committed