delta/libgit2.git/tests/merge/trees/commits.c, branch ethomson/test_https

object_type: use new enumeration names

2018-12-01T11:54:57+00:00

Use the new object_type enumeration names within the codebase.

merge tests: move expected data into own file

2015-11-25T20:38:22+00:00

merge: rename `git_merge_tree_flags_t` -> `git_merge_flags_t`

2015-11-25T20:37:05+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 git_merge_tree_opts to git_merge_options

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

Introduce git_merge_file for consumers

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

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.

Clean up warnings

2013-12-09T16:40:44+00:00

Bare naked merge and rebase

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