Edward Thomson 9ebb5a3ff3 merge: merge iterators		2015-05-11 14:11:56 -04:00
..
trees	merge: merge iterators	2015-05-11 14:11:56 -04:00
workdir	Renamed git_merge_options 'flags' to 'tree_flags'	2015-03-16 09:53:27 +02:00
files.c	Collapse whitespace flags into git_merge_file_flags_t	2015-03-16 09:53:27 +02:00
merge_helpers.c	Remove the signature from ref-modifying functions	2015-03-03 14:40:50 +01:00
merge_helpers.h	Factor 40 and 41 constants from source.	2014-09-16 13:07:04 +02:00