From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 6 Jan 2026 07:34:46 +0000 (+0900)
Subject: Merge branch 'pt/t7800-difftool-test-racefix' into next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=572d775bcae12d94ca314dde7b3c2ac45b65dde3;p=thirdparty%2Fgit.git

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
---

572d775bcae12d94ca314dde7b3c2ac45b65dde3