Merge branch 'es/worktree-docs'

diff --git a/t/helper/test-strcmp-offset.c b/t/helper/test-strcmp-offset.c
index 4a45a54e92745f1ec0102a01b05b338b846cd1d4..44e4a6d143e24cbd05b5d94404a5f5d4e732c880 100644 (file)
--- a/t/helper/test-strcmp-offset.c
+++ b/t/helper/test-strcmp-offset.c
@@ -1,6 +1,7 @@
+#include "test-tool.h"
 #include "cache.h"
 
-int cmd_main(int argc, const char **argv)
+int cmd__strcmp_offset(int argc, const char **argv)
 {
        int result;
        size_t offset;
@@ -11,7 +12,7 @@ int cmd_main(int argc, const char **argv)
        result = strcmp_offset(argv[1], argv[2], &offset);
 
        /*
-        * Because differnt CRTs behave differently, only rely on signs
+        * Because different CRTs behave differently, only rely on signs
         * of the result values.
         */
        result = (result < 0 ? -1 :