 Jakub Kulík
|
f1eeefdfe0
skip tests that require merge3 when it's not available (#2002)
|
hai 2 meses |
|
Jelmer Vernooij
|
0d70b0d459
Add support for octopus merge strategy
|
hai 3 meses |
|
Jelmer Vernooij
|
d33a2a2911
Use logging module for dulwich.cli
|
hai 5 meses |
|
Jelmer Vernooij
|
1e2f93e213
Fix deprecation warnings
|
hai 6 meses |
|
Jelmer Vernooij
|
242374e2a4
Fix typo in license preamble: "public" -> "published"
|
hai 6 meses |
|
Jelmer Vernooij
|
fa0c8ffa7a
Fix typing
|
hai 7 meses |
|
Jelmer Vernooij
|
6733a03a95
tests: Add more typing
|
hai 7 meses |
|
Jelmer Vernooij
|
2e121029cd
Add merge-tree plumbing command
|
hai 7 meses |
|
Jelmer Vernooij
|
3feebd46a3
Fix tests
|
hai 7 meses |
|
Jelmer Vernooij
|
7b01471840
Format
|
hai 8 meses |
|
Jelmer Vernooij
|
d868cd7bfd
Add basic merge command
|
hai 8 meses |
