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

diff --git a/t/t6012-rev-list-simplify.sh b/t/t6012-rev-list-simplify.sh
index fde5e712eb512791c893de7b393fe36e382a3f6d..b89cd6b07a3df8f10c89e97ddf5cad7338e065bc 100755 (executable)
--- a/t/t6012-rev-list-simplify.sh
+++ b/t/t6012-rev-list-simplify.sh
@@ -95,10 +95,7 @@ check_outcome () {
                git log --pretty="$FMT" --parents $param |
                unnote >actual &&
                sed -e "s/^.*   \([^ ]*\) .*/\1/" >check <actual &&
-               test_cmp expect check || {
-                       cat actual
-                       false
-               }
+               test_cmp expect check
        '
 }
 
@@ -121,10 +118,7 @@ test_expect_success 'full history simplification without parent' '
        git log --pretty="$FMT" --full-history E -- lost |
        unnote >actual &&
        sed -e "s/^.*   \([^ ]*\) .*/\1/" >check <actual &&
-       test_cmp expect check || {
-               cat actual
-               false
-       }
+       test_cmp expect check
 '
 
 test_expect_success '--full-diff is not affected by --parents' '