| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Introduce git_merge_file for consumers | Edward Thomson | 2014-03-20 | 1 | -78/+0 |
| | | |||||
| * | Introduce diff3 mode for checking out conflicts | Edward Thomson | 2014-01-20 | 1 | -0/+9 |
| | | |||||
| * | merge_file should use more aggressive levels | Edward Thomson | 2014-01-20 | 1 | -1/+13 |
| | | | | | | | | | | | | 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. | ||||
| * | Fix trailing whitespaces | nulltoken | 2013-05-15 | 1 | -3/+3 |
| | | |||||
| * | merge! | Edward Thomson | 2013-04-30 | 1 | -0/+71 |
 |
index : delta/libgit2.git | |
| github.com: libgit2/libgit2.git |
| summaryrefslogtreecommitdiff |