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

diff --git a/t/t4212-log-corrupt.sh b/t/t4212-log-corrupt.sh
index 67bd8ec020e7919a37c581d3ea7c6c12e70f4276..22aa8b7c0e08d680233ffbcfa9a16d0f57c340d1 100755 (executable)
--- a/t/t4212-log-corrupt.sh
+++ b/t/t4212-log-corrupt.sh
@@ -61,7 +61,7 @@ test_expect_success 'unparsable dates produce sentinel value' '
 test_expect_success 'unparsable dates produce sentinel value (%ad)' '
        commit=$(munge_author_date HEAD totally_bogus) &&
        echo >expect &&
-       git log -1 --format=%ad $commit >actual
+       git log -1 --format=%ad $commit >actual &&
        test_cmp expect actual
 '