X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin%2Fmerge.c;h=47e705ba9b6bb043b28183422d518b65cf513478;hb=515cc0101943b766fde7aa894827119e332ec033;hp=1bcf7fd9d54c2d65cb27a675c061dc23a16112fa;hpb=e40b34b1ec2c91aaed5572116cd8d01afff7851f;p=git.git

diff --git a/builtin/merge.c b/builtin/merge.c
index 1bcf7fd9d..47e705ba9 100644
--- 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++;