3 Commits

Author	SHA1	Message	Date
Edward Thomson	0e1ba46cfb	Remove the "merge none" flag ... The "merge none" (don't automerge) flag was only to aide in merge trivial tests. We can easily determine whether merge trivial resulted in a trivial merge or an automerge by examining the REUC after automerge has completed.	2014-01-20 17:15:14 -05:00
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
Ben Straub	1782038144	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00