]> git.proxmox.com Git - libgit2.git/history - tests/merge/trees/recursive.c
bump version to 1.5.0+ds-6~bpo11+pve1
[libgit2.git] / tests / merge / trees / recursive.c
2022-12-06 Fabian GrünbichlerMerge https://salsa.debian.org/debian/libgit2 into...
2022-08-28 Timo RöhlingUpdate upstream source from tag 'upstream/1.5.0+ds'
2022-08-28 Timo RöhlingNew upstream version 1.5.0+ds
2018-04-26 Pirate PraveenUpdate upstream source from tag 'upstream/0.27.0+dfsg.1'
2018-04-26 Pirate PraveenNew upstream version 0.27.0+dfsg.1
2016-04-03 Andreas HenrikssonMerge tag 'upstream/0.24.0'
2016-04-03 Andreas HenrikssonImported Upstream version 0.24.0
2015-12-01 Edward ThomsonMerge pull request #3508 from libgit2/cmn/tree-parse...
2015-11-30 Carlos Martín NietoMerge pull request #3513 from ethomson/merge_recursive
2015-11-25 Edward Thomsonrecursive merge: add a recursion limit
2015-11-25 Edward Thomsonmerge: handle conflicts in recursive base building
2015-11-25 Edward Thomsonmerge tests: add complex recursive example
2015-11-25 Edward Thomsonmerge: add recursive test with conflicting contents
2015-11-25 Edward Thomsonmerge: add recursive test with three merge bases
2015-11-25 Edward Thomsonmerge: improve test names in recursive merge tests
2015-11-25 Edward Thomsonmerge: add a third-level recursive merge
2015-11-25 Edward Thomsonmerge: add a second-level recursive merge
2015-11-25 Edward Thomsonmerge: add simple recursive test