 Jakub Kulík
|
f1eeefdfe0
skip tests that require merge3 when it's not available (#2002)
|
2 ماه پیش |
|
Jelmer Vernooij
|
0d70b0d459
Add support for octopus merge strategy
|
3 ماه پیش |
|
Jelmer Vernooij
|
f1bfaef9e2
Fix ruff issues (#1886)
|
4 ماه پیش |
|
Jelmer Vernooij
|
1e2f93e213
Fix deprecation warnings
|
6 ماه پیش |
|
Jelmer Vernooij
|
242374e2a4
Fix typo in license preamble: "public" -> "published"
|
6 ماه پیش |
|
Jelmer Vernooij
|
fcc58c8e91
Add missing cleanups
|
6 ماه پیش |
|
Jelmer Vernooij
|
2e121029cd
Add merge-tree plumbing command
|
7 ماه پیش |
|
Jelmer Vernooij
|
3feebd46a3
Fix tests
|
8 ماه پیش |
|
Jelmer Vernooij
|
7b01471840
Format
|
8 ماه پیش |
|
Jelmer Vernooij
|
d868cd7bfd
Add basic merge command
|
8 ماه پیش |
