Merge branch 'sg/t7800-difftool-robustify'

Test fix.

* sg/t7800-difftool-robustify:
  t7800-difftool: don't accidentally match tmp dirs

diff --cc t/t7800-difftool.sh
index 9662abc1e784a925f1595e663b6a15978ea46be4,d118fdb98bf8034ef2273e9efcf6d392fd6d70a9..9192c141ffc618f70e15b7cf25883d55469e5c11
--- 1/t/t7800-difftool.sh
--- 2/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@@ -529,8 -526,8 +529,8 @@@ run_dir_diff_test 'difftool --dir-diff 
  run_dir_diff_test 'difftool --dir-diff when worktree file is missing' '
        test_when_finished git reset --hard &&
        rm file2 &&
 -      git difftool --dir-diff $symlinks --extcmd ls branch master >output &&
 +      git difftool --dir-diff $symlinks --extcmd ls branch main >output &&
-       grep file2 output
+       grep "^file2$" output
  '
  
  run_dir_diff_test 'difftool --dir-diff with unmerged files' '