X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin%2Fmerge.c;h=b48826372f94e8dc48a37c3ff5ea4c727788f92e;hb=ad9ac6db5d58de08d0497b9184e86926377c20dd;hp=37ce4f589f6582abf0d1ef5bd263f590a16853d5;hpb=c5212b87dafb3f559ceb898bd9b40bfc3cd0ad68;p=git.git

diff --git a/builtin/merge.c b/builtin/merge.c
index 37ce4f589..b48826372 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++;