object: rename function 'typename' to 'type_name'

diff --git a/builtin/merge.c b/builtin/merge.c
index 30264cfd7c1720aee814699eb3ca057e292b082d..9dec140960a61cf7c75117a5318aaf9933718943 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -520,7 +520,7 @@ static void merge_name(const char *remote, struct strbuf *msg)
                if (desc && desc->obj && desc->obj->type == OBJ_TAG) {
                        strbuf_addf(msg, "%s\t\t%s '%s'\n",
                                    oid_to_hex(&desc->obj->oid),
-                                   typename(desc->obj->type),
+                                   type_name(desc->obj->type),
                                    remote);
                        goto cleanup;
                }