diff --git a/rhodecode/templates/changeset/changeset.html b/rhodecode/templates/changeset/changeset.html --- a/rhodecode/templates/changeset/changeset.html +++ b/rhodecode/templates/changeset/changeset.html @@ -68,11 +68,6 @@ ! % endif - %if len(c.changeset.parents)>1: -
- ${_('merge')}merge -
- %endif %if c.changeset.parents: %for p_cs in reversed(c.changeset.parents): @@ -84,6 +79,9 @@
${_('No parents')}
%endif + %if len(c.changeset.parents)>1: + ${_('merge')} + %endif ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))} %for tag in c.changeset.tags: