delta/gitano/libgit2.git/src/merge_file.c, branch replace-luagit2

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.

Support union merges

2014-01-20T22:15:15+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.

checkout (from index) can write conflicts

2013-10-16T20:20:06+00:00

Fix trailing whitespaces

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