diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-05-27 14:15:44 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-05-27 14:15:44 +0900 |
| commit | 9020a116d63828a9bd521564d9d41b2c0136e6d2 (patch) | |
| tree | cdcd8f96977b7f214a5222a28329c67af85b5849 /t/t4013/diff.diff_initial..side | |
| parent | 6d2ba7ead7ab074bfd88e194bb75d6b384c44d4e (diff) | |
| parent | 0acbaf9000bd50bfbec24e5c40ab96bbd5e79281 (diff) | |
Merge branch 'kk/merge-octopus-optim'
The logic to determine that branches in an octopus merge are
independent has been optimized.
* kk/merge-octopus-optim:
merge: use repo_in_merge_bases for octopus up-to-date check
Diffstat (limited to 't/t4013/diff.diff_initial..side')
0 files changed, 0 insertions, 0 deletions