diff: introduce diff.submodule configuration variable

diff --git a/t/t6028-merge-up-to-date.sh b/t/t6028-merge-up-to-date.sh
index 824fca5b5b7efe1d472937732b2f55fb7aede830..c518e9c30ccbb12c504d25aa965f8941a3989d8d 100755 (executable)
--- a/t/t6028-merge-up-to-date.sh
+++ b/t/t6028-merge-up-to-date.sh
@@ -79,7 +79,7 @@ test_expect_success 'merge -s subtree up-to-date' '
 
 '
 
-test_expect_failure 'merge fast-forward octopus' '
+test_expect_success 'merge fast-forward octopus' '
 
        git reset --hard c0 &&
        test_tick &&