Edward Thomson 86c8d02c07 merge: add simple recursive test ... Add a simple recursive test - where multiple ancestors exist and creating a virtual merge base from them would prevent a conflict.		2015-11-25 15:37:11 -05:00
..
automerge.c	Update git_merge_tree_opts to git_merge_options	2014-03-20 09:25:08 -07:00
commits.c	merge: rename git_merge_tree_flags_t -> git_merge_flags_t	2015-11-25 15:37:05 -05:00
modeconflict.c	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
recursive.c	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
renames.c	Update git_merge_tree_opts to git_merge_options	2014-03-20 09:25:08 -07:00
treediff.c	merge: rename git_merge_tree_flags_t -> git_merge_flags_t	2015-11-25 15:37:05 -05:00
trivial.c	introduce git_index_entry_is_conflict	2015-05-28 09:47:31 -04:00
whitespace.c	Collapse whitespace flags into git_merge_file_flags_t	2015-03-16 09:53:27 +02:00