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

diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index 938fc8bfd76c9889ebb2129642f878c9449acc9f..66dd28644f954eb91b5f05d5c6f00a8697c4d274 100755 (executable)
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -677,7 +677,7 @@ test_expect_success 'invalid unit' '
        echo 1auto >expect &&
        git config aninvalid.unit >actual &&
        test_cmp expect actual &&
-       cat >expect <<-\EOF
+       cat >expect <<-\EOF &&
        fatal: bad numeric config value '\''1auto'\'' for '\''aninvalid.unit'\'' in .git/config: invalid unit
        EOF
        test_must_fail git config --int --get aninvalid.unit 2>actual &&
@@ -1165,7 +1165,7 @@ test_expect_failure 'adding a key into an empty section reuses header' '
        Qkey = value
        EOF
 
-       git config section.key value
+       git config section.key value &&
        test_cmp expect .git/config
 '