delta/libgit2.git/include/git2/merge.h, branch ethomson/git_obj

merge: make analysis possible against a non-HEAD reference

2018-10-19T18:39:17+00:00

This moves the current merge analysis code into a more generic version
that can work against any reference.

Also change the tests to check returned analysis values exactly.

docs: standardize comment block for git_*_init_options functions

2018-05-07T19:50:38+00:00

merge: allow custom conflict marker size

2018-01-21T11:18:25+00:00

Allow for a custom conflict marker size, allowing callers to override
the default size of the "<<<<<<<" and ">>>>>>>" markers in the
conflicted output file.

merge: set default rename threshold

2017-01-01T22:34:43+00:00

When `GIT_MERGE_FIND_RENAMES` is set, provide a default for
`rename_threshold` when it is unset.

merge driver: allow custom default driver

2016-03-17T15:02:27+00:00

Allow merge users to configure a custom default merge driver via
`git_merge_options`.  Similarly, honor the `merge.default` configuration
option.

Better document `git_merge_commits` redux

2016-02-09T01:56:41+00:00

`git_merge_commits` and `git_merge` now *do* handle recursive base
building for criss-cross merges.  Remove the documentation that says
that they do not.

This reverts commit 5e44d9bcb6d5b20922f49b1913723186f8ced8b5.

recursive merge: add a recursion limit

2015-11-25T21:25:47+00:00

merge: add simple recursive test

2015-11-25T20:37:11+00:00

Add a simple recursive test - where multiple ancestors exist and
creating a virtual merge base from them would prevent a conflict.

merge: rename `git_merge_tree_flags_t` -> `git_merge_flags_t`

2015-11-25T20:37:05+00:00

merge: Implement `GIT_MERGE_TREE_SKIP_REUC`

2015-10-27T21:44:26+00:00