6 Commits

Author	SHA1	Message	Date
Edward Thomson	ed1c64464a	iterator: use an options struct instead of args	2015-08-28 18:39:47 -04:00
Edward Thomson	9ebb5a3ff3	merge: merge iterators	2015-05-11 14:11:56 -04:00
Jacques Germishuys	f29dde6828	Renamed git_merge_options 'flags' to 'tree_flags'	2015-03-16 09:53:27 +02:00
Vicent Marti	737b505116	hashsig: Export as a sys header	2014-10-01 12:03:24 +02:00
Edward Thomson	5aa2ac6de1	Update git_merge_tree_opts to git_merge_options	2014-03-20 09:25:08 -07:00
Ben Straub	1782038144	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00