tests/resources/revert


Log

Author Commit Date CI Message
Edward Thomson 53ca45ee 2014-10-27T17:27:25 revert tests: always use core.autocrlf=false in tests
Edward Thomson c1d648c5 2014-01-08T18:29:42 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.
Edward Thomson 300d192f 2013-12-02T11:15:27 Introduce git_revert to revert a single commit