 Jelmer Vernooij
|
bcf237d786
Merge branch 'master' into recursive-merge
|
пре 3 месеци |
|
Jelmer Vernooij
|
0655f62387
Implement recursive merge strategy for handling multiple merge bases
|
пре 3 месеци |
|
Jelmer Vernooij
|
8b0282d196
Add support for octopus merge strategy
|
пре 3 месеци |
|
Jelmer Vernooij
|
2711c0f834
Fix typing now merge3 has types
|
пре 3 месеци |
|
Jelmer Vernooij
|
266a37e7c5
Use immutable container type annotations where appropriate
|
пре 3 месеци |
|
Jelmer Vernooij
|
64ed1d285b
Fix typing issues broken on other versions/with deps
|
пре 3 месеци |
|
Jelmer Vernooij
|
0b0fed6ee6
Add remaining typing
|
пре 3 месеци |
|
Jelmer Vernooij
|
1eaadb49ff
Fix ruff issues (#1886)
|
пре 4 месеци |
|
Maciej Katafiasz
|
7e5b6e84f7
Factor out checks for merge3 module to a function
|
пре 5 месеци |
|
Jelmer Vernooij
|
15c6faad0c
Fix merge functionality to handle missing merge3 dependency gracefully
|
пре 5 месеци |
|
Jelmer Vernooij
|
9f88c4a625
Add remaining missing docstrings
|
пре 5 месеци |
|
Jelmer Vernooij
|
e921078335
Add basic support for merge drivers
|
пре 6 месеци |
|
Jelmer Vernooij
|
2d2b125a8b
Fix typing
|
пре 7 месеци |
|
Jelmer Vernooij
|
67b77e31eb
merge: Add typing
|
пре 7 месеци |
|
Jelmer Vernooij
|
b1c650fc8c
Cope with missing merge3
|
пре 8 месеци |
|
Jelmer Vernooij
|
5c5095b375
Add basic merge command
|
пре 8 месеци |
|
Jelmer Vernooij
|
52e28288f6
Support merging trees
|
пре 8 месеци |
