]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'pt/t7800-difftool-test-racefix' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 6 Jan 2026 07:34:46 +0000 (16:34 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 6 Jan 2026 07:34:46 +0000 (16:34 +0900)
commit572d775bcae12d94ca314dde7b3c2ac45b65dde3
treef96c25ec939b73d5958ae2e8d902250acb2dc86f
parentc9366fe5a04afd4bfc01bb74b2471bc26509b37a
parent0b495cd390ec39045542f6fcae53ce64264301b7
Merge branch 'pt/t7800-difftool-test-racefix' into next

Test fixup.

* pt/t7800-difftool-test-racefix:
  t7800: fix racy "difftool --dir-diff syncs worktree" test