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 bc0b392a0ec19987beb12f1270d20a853880d06c..66dd28644f954eb91b5f05d5c6f00a8697c4d274 100755 (executable)
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -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
 '