Edward Thomson 8b0ddd5dd9 merge: lock the index at the start of the merge ... Always lock the index when we begin the merge, before we write any of the metdata files. This prevents a race where another client may run a commit after we have written the MERGE_HEAD but before we have updated the index, which will produce a merge commit that is treesame to one parent. The merge will finish and update the index and the resultant commit would not be a merge at all.		2015-02-14 09:25:35 -05:00
..
trees	hashsig: Export as a sys header	2014-10-01 12:03:24 +02:00
workdir	merge: lock the index at the start of the merge	2015-02-14 09:25:35 -05:00
files.c	Introduce git_merge_file for consumers	2014-03-20 09:25:05 -07:00
merge_helpers.c	s/git_merge_head/git_annotated_commit	2014-10-26 22:59:48 -04:00
merge_helpers.h	Factor 40 and 41 constants from source.	2014-09-16 13:07:04 +02:00