Merge branch 'sm/difftool'

Use of some uninitialized variables in "git difftool" has been
corrected.

* sm/difftool:
  builtin/difftool: intialize some hashmap variables
This commit is contained in:
Junio C Hamano
2024-11-22 14:34:18 +09:00
2 changed files with 6 additions and 4 deletions

View File

@ -666,6 +666,10 @@ run_dir_diff_test 'difftool --dir-diff syncs worktree without unstaged change' '
test_cmp expect file
'
run_dir_diff_test 'difftool --dir-diff with no diff' '
git difftool -d main main
'
write_script modify-file <<\EOF
echo "new content" >file
EOF