6 Commits

Author	SHA1	Message	Date
Edward Thomson	976634c467	Introduce git_merge_head_id	2014-03-31 11:43:38 -05:00
Edward Thomson	d9fdee6e4c	Remove git_merge_result as it's now unnecessary	2014-03-20 09:25:09 -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	1c0b6a38ba	Remove fastforward / uptodate from git_merge	2014-03-20 09:25:06 -07:00
Carlos Martín Nieto	a1bbc0ce20	merge: rename _oid() -> id() ... Following the rest of the series, use 'id' when refering to the value.	2014-01-25 08:15:44 +01:00
Ben Straub	1782038144	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00