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

diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh
index 1274f75a609765a1323aa23ba5fe48abee0beb69..833e7b2ceae99cbf53bac63e239b362e368ddf8f 100755 (executable)
--- a/t/t4151-am-abort.sh
+++ b/t/t4151-am-abort.sh
@@ -21,7 +21,7 @@ test_expect_success setup '
                echo $i >otherfile-$i &&
                git add otherfile-$i &&
                test_tick &&
-               git commit -a -m $i || break
+               git commit -a -m $i || return 1
        done &&
        git format-patch --no-numbered initial &&
        git checkout -b side initial &&