delta/libgit2.git/src/merge_file.h, branch ethomson/https_proxy

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.

Introduce git_merge_file for consumers

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

Introduce diff3 mode for checking out conflicts

2014-01-20T22:15:13+00:00

merge_file should use more aggressive levels

2014-01-20T22:15:11+00:00

The default merge_file level was XDL_MERGE_MINIMAL, which will
produce conflicts where there should not be in the case where
both sides were changed identically.  Change the defaults to be
more aggressive (XDL_MERGE_ZEALOUS) which will more aggressively
compress non-conflicts.  This matches git.git's defaults.

Increase testing around reverting a previously reverted commit to
illustrate this problem.

Fix trailing whitespaces

2013-05-15T20:41:30+00:00

merge!

2013-04-30T20:31:31+00:00