diff --git a/kallithea/templates/changeset/changeset.html b/kallithea/templates/changeset/changeset.html --- a/kallithea/templates/changeset/changeset.html +++ b/kallithea/templates/changeset/changeset.html @@ -55,7 +55,7 @@ ${self.repo_context_bar('changelog', c.c
- + %if len(c.changeset.parents)>1: ${_('Merge')} %endif diff --git a/kallithea/templates/changeset/changeset_range.html b/kallithea/templates/changeset/changeset_range.html --- a/kallithea/templates/changeset/changeset_range.html +++ b/kallithea/templates/changeset/changeset_range.html @@ -75,7 +75,7 @@ ${self.repo_context_bar('changelog')} ${h.gravatar_div(h.email_or_none(cs.author), size=20)} ${h.show_id(cs)}
- + %if len(cs.parents)>1: ${_('Merge')} %endif