From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 15 Jan 2026 15:12:40 +0000 (-0800)
Subject: Merge branch 'pt/t7800-difftool-test-racefix'
X-Git-Tag: v2.53.0-rc0~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0453835ab4d507a48d536f8a6352ef03bcbd464;p=thirdparty%2Fgit.git

Merge branch 'pt/t7800-difftool-test-racefix'

Test fixup.

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

c0453835ab4d507a48d536f8a6352ef03bcbd464