 Jelmer Vernooij
|
579040d100
Use make_commit() from test utils in test files
|
hai 3 meses |
|
Jelmer Vernooij
|
bcf237d786
Merge branch 'master' into recursive-merge
|
hai 3 meses |
|
Jelmer Vernooij
|
0655f62387
Implement recursive merge strategy for handling multiple merge bases
|
hai 3 meses |
|
Jelmer Vernooij
|
8b0282d196
Add support for octopus merge strategy
|
hai 3 meses |
|
Jelmer Vernooij
|
59e12925bd
Add DepdendencyMissing class
|
hai 3 meses |
|
Jelmer Vernooij
|
1eaadb49ff
Fix ruff issues (#1886)
|
hai 4 meses |
|
Jelmer Vernooij
|
b1c650fc8c
Cope with missing merge3
|
hai 8 meses |
|
Jelmer Vernooij
|
5c5095b375
Add basic merge command
|
hai 8 meses |
|
Jelmer Vernooij
|
52e28288f6
Support merging trees
|
hai 8 meses |
