1 file changed
+1
-1
lines changed- CHANGELOG.md+12-1
- CMakeLists.txt+2
- CONTRIBUTING.md+16-1
- include/git2/merge.h+10-1
- include/git2/sys/merge.h+177
- src/global.c+16
- src/index.c+1-1
- src/indexer.c+7-2
- src/iterator.c+2-2
- src/merge.c+160-63
- src/merge.h+61-2
- src/merge_driver.c+396
- src/merge_driver.h+60
- src/merge_file.c+11-49
- src/push.c+6-6
- src/submodule.c+1-1
- src/tree.c+59-68
- src/tree.h+4-4
- tests/diff/iterator.c+1-1
- tests/merge/driver.c+388
- tests/merge/workdir/simple.c+36
- tests/object/tree/attributes.c+2
0 commit comments