Merge branch 'sb/mailmap-updates'

diff --git a/t/t9802-git-p4-filetype.sh b/t/t9802-git-p4-filetype.sh
index b0d1d94bf417a7c3cdd4f1b07334416aacbee18d..a82744bab072114675dea66fa94f21f661aa8dbd 100755 (executable)
--- a/t/t9802-git-p4-filetype.sh
+++ b/t/t9802-git-p4-filetype.sh
@@ -28,7 +28,7 @@ test_expect_success 'p4 client newlines, unix' '
                test_cmp f-unix-orig f-unix &&
 
                # make sure stored in repo as unix newlines
-               # use sed to eat python-appened newline
+               # use sed to eat python-appended newline
                p4 -G print //depot/f-unix | marshal_dump data 2 |\
                    sed \$d >f-unix-p4-print &&
                test_cmp f-unix-orig f-unix-p4-print &&