6 Commits

Author	SHA1	Message	Date
Edward Thomson	db3462ce77	Support union merges	2014-01-20 17:15:15 -05:00
Edward Thomson	e651e8e2b5	Introduce diff3 mode for checking out conflicts	2014-01-20 17:15:13 -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
Edward Thomson	629b661caa	checkout (from index) can write conflicts	2013-10-16 16:20:06 -04:00
nulltoken	1fed6b07f0	Fix trailing whitespaces	2013-05-15 22:41:30 +02:00
Edward Thomson	bec65a5e99	merge!	2013-04-30 15:31:31 -05:00