Merge branch 'ms/remote-tracking-branches-in-doc'

diff --git a/builtin/merge.c b/builtin/merge.c
index 622f5db89aff73b4a6e6c6c7d2e3792dfd1de1b2..bad4536a8738237a87e51011f074814bd8b10ba3 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1054,7 +1054,8 @@ static struct commit_list *collect_parents(struct commit *head_commit,
        for (i = 0; i < argc; i++) {
                struct commit *commit = get_merge_parent(argv[i]);
                if (!commit)
-                       die(_("%s - not something we can merge"), argv[i]);
+                       help_unknown_ref(argv[i], "merge",
+                                        "not something we can merge");
                remotes = &commit_list_insert(commit, remotes)->next;
        }
        *remotes = NULL;