Edward Thomson 9be638ecf0 git_diff_generated: abstract generated diffs		2016-05-26 13:01:08 -05:00
..
automerge.c	merge tests: move expected data into own file	2015-11-25 15:38:22 -05:00
commits.c	merge tests: move expected data into own file	2015-11-25 15:38:22 -05:00
modeconflict.c	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
recursive.c	recursive merge: add a recursion limit	2015-11-25 16:25:47 -05:00
renames.c	Update git_merge_tree_opts to git_merge_options	2014-03-20 09:25:08 -07:00
treediff.c	git_diff_generated: abstract generated diffs	2016-05-26 13:01:08 -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