Edward Thomson 5b9c63c3f6 recursive merge: add a recursion limit		2015-11-25 16:25:47 -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
recursive.c	recursive merge: add a recursion limit	2015-11-25 16:25:47 -05:00
renames.c
treediff.c	merge: rename git_merge_tree_flags_t -> git_merge_flags_t	2015-11-25 15:37:05 -05:00
trivial.c
whitespace.c