Merge branch 'jk/format-patch-from' into maint

diff --git a/t/lib-t6000.sh b/t/lib-t6000.sh
index 4ffd90127edb360142e492f6562c3c15c002d286..3f2d873fec9ed9e98b787cd708cd9e8e816e7573 100644 (file)
--- a/t/lib-t6000.sh
+++ b/t/lib-t6000.sh
@@ -34,7 +34,7 @@ save_tag () {
        mv sed.script.tmp sed.script
 }
 
-# Replace unhelpful sha1 hashses with their symbolic equivalents
+# Replace unhelpful sha1 hashes with their symbolic equivalents
 entag () {
        sed -f sed.script
 }