Merge branch 'jk/diff-no-index-pager' into maint

diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 2aa1824a940aa955fab408995d2479e50bd42b96..c17f52e586747198a74323b578a654edec436f57 100755 (executable)
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -2117,7 +2117,7 @@ test_expect_success \
     grep :1 git.marks'
 
 test_expect_success \
-    'R: export-marks options can be overriden by commandline options' \
+    'R: export-marks options can be overridden by commandline options' \
     'cat input | git fast-import --export-marks=other.marks &&
     grep :1 other.marks'