Merge branch 'mg/editorconfig-makefile'

[thirdparty/git.git] / merge-ll.c

diff --git a/merge-ll.c b/merge-ll.c
index 34514e8bc6363e4d65c646f4e1134da21f255ec0..bf1077ae0928e99cb0c5dc0814fecf9e141447b7 100644 (file)
--- a/merge-ll.c
+++ b/merge-ll.c
@@ -294,7 +294,7 @@ static int read_merge_config(const char *var, const char *value,
         * after seeing merge.<name>.var1.
         */
        for (fn = ll_user_merge; fn; fn = fn->next)
-               if (!strncmp(fn->name, name, namelen) && !fn->name[namelen])
+               if (!xstrncmpz(fn->name, name, namelen))
                        break;
        if (!fn) {
                CALLOC_ARRAY(fn, 1);