5 Commits

Author	SHA1	Message	Date
Edward Thomson	5aa2ac6de1	Update git_merge_tree_opts to git_merge_options	2014-03-20 09:25:08 -07:00
Edward Thomson	05d47768ca	Introduce git_merge_file for consumers	2014-03-20 09:25:05 -07:00
Carlos Martín Nieto	d541170c77	index: rename an entry's id to 'id' ... This was not converted when we converted the rest, so do it now.	2014-01-25 08:15:44 +01: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