3 Commits

Author	SHA1	Message	Date
Edward Thomson	53ca45ee25	revert tests: always use core.autocrlf=false in tests	2014-10-27 17:27:25 -04: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	300d192f7e	Introduce git_revert to revert a single commit	2013-12-02 16:57:41 -06:00