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
..
trees	merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICT	2015-10-22 14:55:17 -04:00
workdir	merge: work around write-side racy protection when hacking the index	2015-06-22 16:11:58 +02:00
files.c	diff: don't feed large files to xdiff	2015-10-05 22:59:50 +02:00
merge_helpers.c	merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICT	2015-10-22 14:55:17 -04:00
merge_helpers.h	Factor 40 and 41 constants from source.	2014-09-16 13:07:04 +02:00