delta/libgit2.git/tests/merge/merge_helpers.h, branch cmn/https-cap-no-hardcode github.com: libgit2/libgit2.git merge tests: move expected data into own file 2015-11-25T20:38:22+00:00 Edward Thomson ethomson@edwardthomson.com 2015-11-09T13:23:27+00:00 dcde5720424961f526e8c070b7d99191d7ef75c1 






Factor 40 and 41 constants from source.
2014-09-16T11:07:04+00:00

Ciro Santilli
ciro.santilli@gmail.com

2014-09-16T09:49:25+00:00

3b2cb2c91ee77e5e45957e8355025e3e742c07bd












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












Introduce git_merge_file for consumers
2014-03-20T16:25:05+00:00

Edward Thomson
ethomson@edwardthomson.com

2014-03-11T06:30:41+00:00

05d47768caf6fec51fa85cb6275c9ba8324aead6












Bare naked merge and rebase
2013-12-03T15:18:53+00:00

Edward Thomson
ethomson@microsoft.com

2013-12-02T19:10:04+00:00

eac938d96eccb39c30ce94adf7f8cdc06df098fe












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