 Jelmer Vernooij
|
907fbcddd9
Use make_commit() from test utils in test files
|
hai 3 meses |
|
Jelmer Vernooij
|
b6faec98e5
Merge branch 'master' into recursive-merge
|
hai 3 meses |
|
Jelmer Vernooij
|
2b4bba1886
Implement recursive merge strategy for handling multiple merge bases
|
hai 3 meses |
|
Jelmer Vernooij
|
0d70b0d459
Add support for octopus merge strategy
|
hai 3 meses |
|
Jelmer Vernooij
|
c81f6f33f4
Add DepdendencyMissing class
|
hai 4 meses |
|
Jelmer Vernooij
|
f1bfaef9e2
Fix ruff issues (#1886)
|
hai 4 meses |
|
Jelmer Vernooij
|
a00f34f27c
Cope with missing merge3
|
hai 8 meses |
|
Jelmer Vernooij
|
d868cd7bfd
Add basic merge command
|
hai 8 meses |
|
Jelmer Vernooij
|
e1473c396f
Support merging trees
|
hai 8 meses |
