delta/libgit2.git/tests/revert, branch shiftkey-patch-1

Capture conflict information in MERGE_MSG for revert and merge

2014-04-14T14:16:22+00:00

Update git_merge_tree_opts to git_merge_options

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

git_revert_opts -> git_revert_options

2014-03-06T17:44:52+00:00

More merge.conflictstyle fixes

2014-02-05T22:10:19+00:00

Add reflog parameters to git_reset

2014-02-03T23:05:55+00:00

Remove the "merge none" flag

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

The "merge none" (don't automerge) flag was only to aide in
merge trivial tests.  We can easily determine whether merge
trivial resulted in a trivial merge or an automerge by examining
the REUC after automerge has completed.

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.

Reorder var decls in revert test

2013-12-03T15:47:18+00:00

Oh, MSVC.

Bare naked merge and rebase

2013-12-03T15:18:53+00:00

Introduce git_revert to revert a single commit

2013-12-02T22:57:41+00:00