Merge branch 'vd/fsck-submodule-url-test'

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

diff --git a/merge-ll.c b/merge-ll.c
index 8fcf2d3710ed1a87bd851abe04dd22a32fafdf84..1df58ebaac08582d042268f5a07cf5cbd9d7b1c3 100644 (file)
--- a/merge-ll.c
+++ b/merge-ll.c
@@ -301,7 +301,7 @@ static int read_merge_config(const char *var, const char *value,
 
        if (!strcmp("driver", key)) {
                if (!value)
-                       return error("%s: lacks value", var);
+                       return config_error_nonbool(var);
                /*
                 * merge.<name>.driver specifies the command line:
                 *