delta/libgit2.git/include/git2/merge.h, branch cmn/init-libssh2

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

merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICT

2015-10-22T18:55:17+00:00

Provide a new merge option, GIT_MERGE_TREE_FAIL_ON_CONFLICT, which
will stop on the first conflict and fail the merge operation with
GIT_EMERGECONFLICT.

Update documentation for API changes

2015-04-30T14:59:50+00:00

Added options to enable patience and minimal diff drivers

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

Collapse whitespace flags into git_merge_file_flags_t

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

Renamed git_merge_options 'flags' to 'tree_flags'

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