diff: do not reuse_worktree_file for submodules

diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 3ff5fb853c941586e3e5ed69a74a628dfe5bb84a..10aa028017833479c43bbb551741dfd36d9741aa 100755 (executable)
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -502,7 +502,7 @@ test_expect_success 'option --ff-only overwrites --no-ff' '
        test_must_fail git merge --no-ff --ff-only c2
 '
 
-test_expect_success 'option --ff-only overwrites merge.ff=only config' '
+test_expect_success 'option --no-ff overrides merge.ff=only config' '
        git reset --hard c0 &&
        test_config merge.ff only &&
        git merge --no-ff c1