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

diff --git a/t/t4022-diff-rewrite.sh b/t/t4022-diff-rewrite.sh
index 2d030a4ec35009105c26e9689dcae1150fed7b2d..cb51d9f9d47d61c5b73de78edeeedcc7652f262d 100755 (executable)
--- a/t/t4022-diff-rewrite.sh
+++ b/t/t4022-diff-rewrite.sh
@@ -20,10 +20,7 @@ test_expect_success setup '
 test_expect_success 'detect rewrite' '
 
        actual=$(git diff-files -B --summary test) &&
-       expr "$actual" : " rewrite test ([0-9]*%)$" || {
-               echo "Eh? <<$actual>>"
-               false
-       }
+       verbose expr "$actual" : " rewrite test ([0-9]*%)$"
 
 '