delta/libgit2.git/tests/resources/revert, branch ethomson/https_proxy github.com: libgit2/libgit2.git revert tests: always use core.autocrlf=false in tests 2014-10-27T21:27:25+00:00 Edward Thomson ethomson@microsoft.com 2014-10-27T21:27:25+00:00 53ca45ee25b712eaac367fdc37be40bee9f40711 






merge_file should use more aggressive levels
2014-01-20T22:15:11+00:00

Edward Thomson
ethomson@microsoft.com

2014-01-09T02:29:42+00:00

c1d648c5c6361edfb1aa85a31656b628672c7616

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.





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.







Introduce git_revert to revert a single commit
2013-12-02T22:57:41+00:00

Edward Thomson
ethomson@microsoft.com

2013-12-02T16:15:27+00:00

300d192f7ed45112121f2a35d5ca80a4913c7aad