Merge branch 'mm/maint-hint-failed-merge' into maint

diff --git a/t/t4034-diff-words.sh b/t/t4034-diff-words.sh
index 82240cf44d6afe86ba173ddd5c1b4f6c3850417e..21db6e95c4dd7ccf2f25d887fc2c42f3adcd4124 100755 (executable)
--- a/t/t4034-diff-words.sh
+++ b/t/t4034-diff-words.sh
@@ -77,7 +77,7 @@ cat > expect <<\EOF
 <GREEN>aeff = aeff * ( aaa )<RESET>
 EOF
 
-test_expect_failure 'word diff without context' '
+test_expect_success 'word diff without context' '
 
        word_diff --color-words --unified=0