Merge branch 'da/difftool-mergetool-simplify-reporting-status'

diff --git a/t/t7012-skip-worktree-writing.sh b/t/t7012-skip-worktree-writing.sh
index cffb2696d4b1a1ca7bdc962590dc7cedde1e5e2a..9ceaa4049f960f20ca37d58e58e9e6c4e9ff4398 100755 (executable)
--- a/t/t7012-skip-worktree-writing.sh
+++ b/t/t7012-skip-worktree-writing.sh
@@ -54,7 +54,7 @@ test_expect_success 'read-tree removes worktree, dirty case' '
 '
 
 NULL_SHA1=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
-ZERO_SHA0=0000000000000000000000000000000000000000
+
 setup_absent() {
        test -f 1 && rm 1
        git update-index --remove 1 &&