Edward Thomson c1d648c5c6 merge_file should use more aggressive levels ... The default merge_file level was XDL_MERGE_MINIMAL, which will produce conflicts where there should not be in the case where both sides were changed identically. Change the defaults to be more aggressive (XDL_MERGE_ZEALOUS) which will more aggressively compress non-conflicts. This matches git.git's defaults. Increase testing around reverting a previously reverted commit to illustrate this problem.		2014-01-20 17:15:11 -05:00
..
fastforward.c	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
renames.c	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
setup.c	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
simple.c	merge_file should use more aggressive levels	2014-01-20 17:15:11 -05:00
trivial.c	merge_file should use more aggressive levels	2014-01-20 17:15:11 -05:00