diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-03 15:37:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-03 15:37:50 -0700 |
| commit | e9fee67fac9c3ae40e348a992059fa092148e7f2 (patch) | |
| tree | 20e4d2d86a525cea977b1a9b6477364a55f0e7bb /builtin | |
| parent | 250ee16c14c8b37b437fbfc7345313d7db32b95d (diff) | |
| parent | f3f8af0e54a31ffed242dc36482f82393f596ee5 (diff) | |
| download | git-e9fee67fac9c3ae40e348a992059fa092148e7f2.tar.gz | |
Merge branch 'vv/help-unknown-ref' into maint
* vv/help-unknown-ref:
merge: use help_unknown_ref()
help: add help_unknown_ref()
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/merge.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 3e2daa37c3..2ebe732896 100644 --- 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; |