Change incorrect "remote branch" to "remote tracking branch" in C code

[git.git] / builtin / merge.c

diff --git a/builtin/merge.c b/builtin/merge.c
index 10f091b51960cd6ae913b1c4d2ab9e6931862351..9ec13f14bdcc3996fe18ed6fdf761ec07e627792 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -403,7 +403,7 @@ static void merge_name(const char *remote, struct strbuf *msg)
                        goto cleanup;
                }
                if (!prefixcmp(found_ref, "refs/remotes/")) {
-                       strbuf_addf(msg, "%s\t\tremote branch '%s' of .\n",
+                       strbuf_addf(msg, "%s\t\tremote-tracking branch '%s' of .\n",
                                    sha1_to_hex(branch_head), remote);
                        goto cleanup;
                }