Merge branch 'jk/difftool-in-subdir' into maint

diff --git a/split-index.c b/split-index.c
index 968b780a06d1f17b190395f06f78fc3124fcf445..3c75d4b9ce717fa92520881ef754485d068a3a60 100644 (file)
--- a/split-index.c
+++ b/split-index.c
@@ -60,7 +60,7 @@ static void mark_base_index_entries(struct index_state *base)
         * To keep track of the shared entries between
         * istate->base->cache[] and istate->cache[], base entry
         * position is stored in each base entry. All positions start
-        * from 1 instead of 0, which is resrved to say "this is a new
+        * from 1 instead of 0, which is reserved to say "this is a new
         * entry".
         */
        for (i = 0; i < base->cache_nr; i++)