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
..
trees	hashsig: Export as a sys header	2014-10-01 12:03:24 +02:00
workdir	merge test: test an actual failure, not conflict	2015-02-13 11:44:34 -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