Edward Thomson 42f98a26a5 merge test: test an actual failure, not conflict ... Correct the merge failed cleanup test. Merge data should not be cleaned up on conflicts, only on actual failure. And ORIG_HEAD should not be removed at all.		2015-02-13 11:44:34 -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 test: test an actual failure, not conflict	2015-02-13 11:44:34 -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