delta/libgit2.git/tests/merge/files.c, branch cmn/https-cap-no-hardcode

merge tests: move expected data into own file

2015-11-25T20:38:22+00:00

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.

merge_files: don't add trailing newlines

2015-07-07T22:01:48+00:00

When invoked with three files that each lack a trailing newline,
the merge result should also lack a trailing newline.

Collapse whitespace flags into git_merge_file_flags_t

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

Added tests to merge files and branches with whitespace problems and fixes

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

Introduce git_merge_file for consumers

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