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

diff --git a/t/t6111-rev-list-treesame.sh b/t/t6111-rev-list-treesame.sh
index 88b84dfa7315ec8e3b41586ad9cd3e43810babd8..32474c23d3e53beda92477c5f126322901f68c53 100755 (executable)
--- a/t/t6111-rev-list-treesame.sh
+++ b/t/t6111-rev-list-treesame.sh
@@ -58,7 +58,7 @@ test_expect_success setup '
 
        git checkout master &&
        test_tick && git merge --no-ff fiddler-branch &&
-       note K
+       note K &&
 
        test_commit "file=Part 1" file "Part 1" L &&
 
@@ -92,10 +92,7 @@ check_outcome () {
                git log --format="$FMT" $param |
                unnote >actual &&
                sed -e "$munge_actual" <actual >check &&
-               test_cmp expect check || {
-                       cat actual
-                       false
-               }
+               test_cmp expect check
        '
 }