delta/libgit2.git/src/merge_file.c, branch cmn/init-libssh2

diff: don't feed large files to xdiff

2015-10-05T20:59:50+00:00

merge_file: treat large files as binary

2015-10-05T20:59:46+00:00

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.

Added options to enable patience and minimal diff drivers

2015-03-16T07:53:27+00:00

Collapse whitespace flags into git_merge_file_flags_t

2015-03-16T07:53:27+00:00

Allow for merges with whitespace discrepancies

2015-03-16T07:53:27+00:00

Cleanups

2014-03-31T20:31:01+00:00

Const up members of git_merge_file_result

2014-03-31T18:08:31+00:00

Introduce git_merge_file for consumers

2014-03-20T16:25:05+00:00

diff: rename the file's 'oid' to 'id'

2014-01-25T07:15:44+00:00

In the same vein as the previous commits in this series.

index: rename an entry's id to 'id'

2014-01-25T07:15:44+00:00

This was not converted when we converted the rest, so do it now.