 Jakub Kulík
|
2d84f930b3
skip tests that require merge3 when it's not available (#2002)
|
1 maand geleden |
|
Jelmer Vernooij
|
8b0282d196
Add support for octopus merge strategy
|
3 maanden geleden |
|
Jelmer Vernooij
|
ed6b7053aa
Use logging module for dulwich.cli
|
5 maanden geleden |
|
Jelmer Vernooij
|
93b2be96d6
Fix deprecation warnings
|
5 maanden geleden |
|
Jelmer Vernooij
|
39f9d87583
Fix typo in license preamble: "public" -> "published"
|
6 maanden geleden |
|
Jelmer Vernooij
|
2d2b125a8b
Fix typing
|
7 maanden geleden |
|
Jelmer Vernooij
|
1f43b80452
tests: Add more typing
|
7 maanden geleden |
|
Jelmer Vernooij
|
fa028bc327
Add merge-tree plumbing command
|
7 maanden geleden |
|
Jelmer Vernooij
|
ec0a8cf822
Fix tests
|
7 maanden geleden |
|
Jelmer Vernooij
|
0fdd5857ac
Format
|
7 maanden geleden |
|
Jelmer Vernooij
|
5c5095b375
Add basic merge command
|
7 maanden geleden |
