gitattributes: Reword "attribute macro" to "macro attribute"

diff --git a/t/t4152-am-subjects.sh b/t/t4152-am-subjects.sh
index 7222c06b803bec2b609e00cb9c75b250ec7867a4..4c68245acad30534d7e3e1f6e980e683d8b5aafd 100755 (executable)
--- a/t/t4152-am-subjects.sh
+++ b/t/t4152-am-subjects.sh
@@ -58,7 +58,7 @@ test_expect_success 'long subject preserved (format-patch | am)' '
 test_expect_success 'long subject preserved (format-patch -k | am)' '
        check_subject long-k
 '
-test_expect_failure 'long subject preserved (format-patch -k | am -k)' '
+test_expect_success 'long subject preserved (format-patch -k | am -k)' '
        check_subject long-k -k
 '
 
@@ -70,7 +70,7 @@ test_expect_success 'multiline subject unwrapped (format-patch -k | am)' '
        check_subject multiline-k
 '
 echo "$MULTILINE_SUBJECT" >expect
-test_expect_failure 'multiline subject preserved (format-patch -k | am -k)' '
+test_expect_success 'multiline subject preserved (format-patch -k | am -k)' '
        check_subject multiline-k -k
 '