thodg/libgit2/tests/resources/revert/.gitted/objects/ee

Diff

  • Show log

    Commit

  • Hash : c1d648c5
    Author : Edward Thomson
    Date : 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.

kmx.io     mail     discord kmxgit v0.4.0