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
..
analysis.c	s/git_merge_head/git_annotated_commit	2014-10-26 22:59:48 -04:00
dirty.c	s/git_merge_head/git_annotated_commit	2014-10-26 22:59:48 -04:00
renames.c	Remove git_merge_result as it's now unnecessary	2014-03-20 09:25:09 -07:00
setup.c	merge: lock the index at the start of the merge	2015-02-14 09:25:35 -05:00
simple.c	Fix broken merge tests due to autocrlf was not false	2014-12-07 23:41:30 +08:00
submodules.c	s/git_merge_head/git_annotated_commit	2014-10-26 22:59:48 -04:00
trivial.c	s/git_merge_head/git_annotated_commit	2014-10-26 22:59:48 -04:00