Autor | SHA1 | Mensagem | Data |
---|---|---|---|
|
31d79ae0af |
Remove unused logger from RecursiveMerger
JGit doesn't currently use java.util.logging.Logger. Remove this
never-used Logger introduced in
|
11 anos atrás |
|
dd6f41e401 |
Add missing @since tags
Change-Id: I6b20d78e6bd1f245fdca331554c106f8bae44b9c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> |
11 anos atrás |
|
ab99b78ca0 |
Implement recursive merge strategy
Extend ResolveMerger with RecursiveMerger to merge two tips that have up to 200 bases. Bug: 380314 CQ: 6854 Change-Id: I6292bb7bda55c0242a448a94956f2d6a94fddbaa Also-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Chris Aniszczyk <zx@twitter.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> |
11 anos atrás |