Edward Thomson e43520660c 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.		2015-10-05 22:59:46 +02:00
..
trees	iterator: use an options struct instead of args	2015-08-28 18:39:47 -04:00
workdir	merge: work around write-side racy protection when hacking the index	2015-06-22 16:11:58 +02:00
files.c	merge_file: treat large files as binary	2015-10-05 22:59:46 +02:00
merge_helpers.c	Fix #3094 - improve use of portable size_t/ssize_t format specifiers.	2015-07-12 19:55:19 +02:00
merge_helpers.h	Factor 40 and 41 constants from source.	2014-09-16 13:07:04 +02:00