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
Edward Thomson	dcde572042	merge tests: move expected data into own file	2015-11-25 15:38:22 -05:00
Ciro Santilli	3b2cb2c91e	Factor 40 and 41 constants from source.	2014-09-16 13:07:04 +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
Edward Thomson	05d47768ca	Introduce git_merge_file for consumers	2014-03-20 09:25:05 -07:00
Edward Thomson	eac938d96e	Bare naked merge and rebase	2013-12-03 10:18:53 -05:00
Ben Straub	1782038144	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00