5 Commits

Author	SHA1	Message	Date
Edward Thomson	d9fdee6e4c	Remove git_merge_result as it's now unnecessary	2014-03-20 09:25:09 -07:00
Edward Thomson	5aa2ac6de1	Update git_merge_tree_opts to git_merge_options	2014-03-20 09:25:08 -07:00
Edward Thomson	02105a27f0	Change signature of git_merge to take merge and checkout opts	2014-03-20 09:25:07 -07:00
Ben Straub	a2ce19ca68	Prevent user's merge.conflictstyle from breaking tests	2014-02-05 13:35:26 -08:00
Ben Straub	1782038144	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00