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
..
automerge.c	Update git_merge_tree_opts to git_merge_options	2014-03-20 09:25:08 -07:00
commits.c	merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICT	2015-10-22 14:55:17 -04:00
modeconflict.c	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
renames.c	Update git_merge_tree_opts to git_merge_options	2014-03-20 09:25:08 -07:00
treediff.c	iterator: use an options struct instead of args	2015-08-28 18:39:47 -04:00
trivial.c	introduce git_index_entry_is_conflict	2015-05-28 09:47:31 -04:00
whitespace.c	Collapse whitespace flags into git_merge_file_flags_t	2015-03-16 09:53:27 +02:00