8 Commits

Author	SHA1	Message	Date
Edward Thomson	dcde572042	merge tests: move expected data into own file	2015-11-25 15:38:22 -05:00
Edward Thomson	fa78782f67	merge: rename git_merge_tree_flags_t -> git_merge_flags_t	2015-11-25 15:37:05 -05:00
Edward Thomson	8683d31f08	merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICT ... Provide a new merge option, GIT_MERGE_TREE_FAIL_ON_CONFLICT, which will stop on the first conflict and fail the merge operation with GIT_EMERGECONFLICT.	2015-10-22 14:55:17 -04:00
Edward Thomson	5aa2ac6de1	Update git_merge_tree_opts to git_merge_options	2014-03-20 09:25:08 -07:00
Edward Thomson	05d47768ca	Introduce git_merge_file for consumers	2014-03-20 09:25:05 -07:00
Carlos Martín Nieto	d541170c77	index: rename an entry's id to 'id' ... This was not converted when we converted the rest, so do it now.	2014-01-25 08:15:44 +01:00
Edward Thomson	5588f07360	Clean up warnings	2013-12-09 11:40:44 -05:00
Edward Thomson	eac938d96e	Bare naked merge and rebase	2013-12-03 10:18:53 -05:00