]> git.ipfire.org Git - thirdparty/git.git/commitdiff
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)
Test fixup.

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


Trivial merge