9 Commits

Author	SHA1	Message	Date
Utkarsh Gupta	0c9c969a9b	New upstream version 0.99.0+dfsg.1	2020-03-14 00:52:48 +05:30
Jongmin Kim	ac3d33df5d	New upstream version 0.28.1+dfsg.1	2019-05-12 00:29:21 +09:00
Edward Thomson	fa78782f67	merge: rename git_merge_tree_flags_t -> git_merge_flags_t	2015-11-25 15:37:05 -05:00
Jacques Germishuys	f29dde6828	Renamed git_merge_options 'flags' to 'tree_flags'	2015-03-16 09:53:27 +02:00
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