Merge branch 'jk/config-lockfile-leak-fix' into maint

diff --git a/t/helper/test-strcmp-offset.c b/t/helper/test-strcmp-offset.c
index 4a45a54e92745f1ec0102a01b05b338b846cd1d4..e159c9a127f6854541ab497c8fd4b6efb9d4ea39 100644 (file)
--- a/t/helper/test-strcmp-offset.c
+++ b/t/helper/test-strcmp-offset.c
@@ -11,7 +11,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 :