Jacques Germishuys 13de936316 Collapse whitespace flags into git_merge_file_flags_t		2015-03-16 09:53:27 +02:00
..
automerge.c	Update git_merge_tree_opts to git_merge_options	2014-03-20 09:25:08 -07:00
commits.c	Update git_merge_tree_opts to git_merge_options	2014-03-20 09:25:08 -07:00
modeconflict.c	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
renames.c	Update git_merge_tree_opts to git_merge_options	2014-03-20 09:25:08 -07:00
treediff.c	Renamed git_merge_options 'flags' to 'tree_flags'	2015-03-16 09:53:27 +02:00
trivial.c	Introduce cl_assert_equal_oid	2014-07-01 14:40:16 -04:00
whitespace.c	Collapse whitespace flags into git_merge_file_flags_t	2015-03-16 09:53:27 +02:00