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
..
trees	merge_file should use more aggressive levels	2014-01-20 17:15:11 -05:00
workdir	merge_file should use more aggressive levels	2014-01-20 17:15:11 -05:00
merge_helpers.c	refs: remove the _with_log differentiation	2014-01-15 13:32:43 +01:00
merge_helpers.h	Bare naked merge and rebase	2013-12-03 10:18:53 -05:00