wt-status.c: set commitable bit if there is a meaningful merge.

diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index 5811a982f472e3b79f31cc50dcdef92dcdb4a58c..540771ca419b82e4dd32adf986545515fa1db66e 100755 (executable)
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -766,7 +766,7 @@ test_expect_success 'moving the superproject does not break submodules' '
        (
                cd addtest &&
                git submodule status >expect
-       )
+       ) &&
        mv addtest addtest2 &&
        (
                cd addtest2 &&
@@ -987,7 +987,7 @@ test_expect_success 'submodule with UTF-8 name' '
 
 test_expect_success 'submodule add clone shallow submodule' '
        mkdir super &&
-       pwd=$(pwd)
+       pwd=$(pwd) &&
        (
                cd super &&
                git init &&