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
..
trees	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
workdir	merge: rename git_merge_tree_flags_t -> git_merge_flags_t	2015-11-25 15:37:05 -05:00
files.c	diff: don't feed large files to xdiff	2015-10-05 22:59:50 +02:00
merge_helpers.c	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
merge_helpers.h	Factor 40 and 41 constants from source.	2014-09-16 13:07:04 +02:00