Merge branch 'jn/cherry-revert-message-clean-up'

[git.git] / builtin / merge.c

diff --git a/builtin/merge.c b/builtin/merge.c
index 1bcf7fd9d54c2d65cb27a675c061dc23a16112fa..47e705ba9b6bb043b28183422d518b65cf513478 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -486,7 +486,8 @@ static int git_merge_config(const char *k, const char *v, void *cb)
                buf = xstrdup(v);
                argc = split_cmdline(buf, &argv);
                if (argc < 0)
-                       die("Bad branch.%s.mergeoptions string", branch);
+                       die("Bad branch.%s.mergeoptions string: %s", branch,
+                           split_cmdline_strerror(argc));
                argv = xrealloc(argv, sizeof(*argv) * (argc + 2));
                memmove(argv + 1, argv, sizeof(*argv) * (argc + 1));
                argc++;