| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge tests: move expected data into own file | Edward Thomson | 2015-11-25 | 1 | -1/+2 |
| | | |||||
| * | Update git_merge_tree_opts to git_merge_options | Edward Thomson | 2014-03-20 | 1 | -4/+4 |
| | | |||||
| * | Introduce git_merge_file for consumers | Edward Thomson | 2014-03-20 | 1 | -22/+0 |
| | | |||||
| * | index: rename an entry's id to 'id' | Carlos MartÃn Nieto | 2014-01-25 | 1 | -1/+1 |
| | | | | | This was not converted when we converted the rest, so do it now. | ||||
| * | merge_file should use more aggressive levels | Edward Thomson | 2014-01-20 | 1 | -2/+2 |
| | | | | | | | | | | | | 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. | ||||
| * | Rename tests-clar to tests | Ben Straub | 2013-11-14 | 1 | -0/+217 |
 |
index : delta/libgit2.git | |
| github.com: libgit2/libgit2.git |
| summaryrefslogtreecommitdiff |