delta/libgit2.git/tests/merge/workdir/renames.c, branch cmn/https-cap-no-hardcode github.com: libgit2/libgit2.git merge: rename `git_merge_tree_flags_t` -> `git_merge_flags_t` 2015-11-25T20:37:05+00:00 Edward Thomson ethomson@edwardthomson.com 2015-10-22T21:00:09+00:00 fa78782f67d17c5b139a2bbe3ceefe54c8c71dd3 






Renamed git_merge_options 'flags' to 'tree_flags'
2015-03-16T07:53:27+00:00

Jacques Germishuys
jacquesg@striata.com

2015-03-12T10:29:47+00:00

f29dde682866c293292ce405fcfef1511ced3f55












Remove `git_merge_result` as it's now unnecessary
2014-03-20T16:25:09+00:00

Edward Thomson
ethomson@microsoft.com

2014-03-12T16:43:53+00:00

d9fdee6e4cb87e4531d9ddba92b44e5323e794da












Update git_merge_tree_opts to git_merge_options
2014-03-20T16:25:08+00:00

Edward Thomson
ethomson@microsoft.com

2014-03-12T05:47:39+00:00

5aa2ac6de1622308884fd542f7b29e6810a0e98e












Change signature of `git_merge` to take merge and checkout opts
2014-03-20T16:25:07+00:00

Edward Thomson
ethomson@microsoft.com

2014-03-12T01:40:38+00:00

02105a27f01509ce4e641487cae040662ee477a2












Prevent user's merge.conflictstyle from breaking tests
2014-02-05T21:35:26+00:00

Ben Straub
bs@github.com

2014-02-05T21:35:26+00:00

a2ce19ca68e060838ec08d7f3e0c35160a2b6697












Rename tests-clar to tests
2013-11-14T22:05:52+00:00

Ben Straub
bs@github.com

2013-11-14T22:05:52+00:00

1782038144ef3413831801bb9c2f3038a84ac6f4