summaryrefslogtreecommitdiffstats
path: root/git-remote-testgit
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2026-05-17 22:58:30 +0900
committerJunio C Hamano <gitster@pobox.com>2026-05-17 22:58:30 +0900
commit3cfbb7b3f79ed99690d86c112f233723423d1baf (patch)
tree1098aea98ac8b20018fdc738416192badac25f15 /git-remote-testgit
parentf7ae594a851ff7ceef3b2b6c959ea18bdc940363 (diff)
parentb2eec6663f10a53dead5e7a4e5e9b91220bf9473 (diff)
downloadgit-3cfbb7b3f79ed99690d86c112f233723423d1baf.tar.gz
git-3cfbb7b3f79ed99690d86c112f233723423d1baf.zip
Merge branch 'en/ort-cached-rename-with-trivial-resolution'
"ort" merge backend improvements. * en/ort-cached-rename-with-trivial-resolution: merge-ort: handle cached rename & trivial resolution interaction better
Diffstat (limited to 'git-remote-testgit')
0 files changed, 0 insertions, 0 deletions