diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2015-09-28 18:25:24 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2015-10-05 22:59:46 +0200 |
| commit | e43520660c6dba6470af28ce3be822be401f5788 (patch) | |
| tree | 2d92182ad519b70e308a997c43cdfb382cc24c35 /src/diff_patch.c | |
| parent | 46c0e6e3c169f8d76ed739444bc51c4b3f74969b (diff) | |
| download | libgit2-e43520660c6dba6470af28ce3be822be401f5788.tar.gz | |
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.
Diffstat (limited to 'src/diff_patch.c')
0 files changed, 0 insertions, 0 deletions