diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-12 12:04:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-12 12:04:07 -0700 |
| commit | 778e4b890390e90e19b7f835f3b0ffe92e8d5345 (patch) | |
| tree | e93c198c3c051a4ce8320f83abd0d11310b10b30 /builtin/merge.c | |
| parent | 5b307e95e880b95eafd36e93251c6638c222dcf4 (diff) | |
| parent | d6ac1d2120573a9dab5a9502fd1cb1a8e4ad58b5 (diff) | |
| download | git-778e4b890390e90e19b7f835f3b0ffe92e8d5345.tar.gz | |
Merge branch 'ms/remote-tracking-branches-in-doc'
* ms/remote-tracking-branches-in-doc:
Change "remote tracking" to "remote-tracking"
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 2ebe732896..bad4536a87 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -948,7 +948,7 @@ static int evaluate_result(void) } /* - * Pretend as if the user told us to merge with the tracking + * Pretend as if the user told us to merge with the remote-tracking * branch we have for the upstream of the current branch */ static int setup_with_upstream(const char ***argv) @@ -967,7 +967,7 @@ static int setup_with_upstream(const char ***argv) args = xcalloc(branch->merge_nr + 1, sizeof(char *)); for (i = 0; i < branch->merge_nr; i++) { if (!branch->merge[i]->dst) - die(_("No remote tracking branch for %s from %s"), + die(_("No remote-tracking branch for %s from %s"), branch->merge[i]->src, branch->remote_name); args[i] = branch->merge[i]->dst; } |