# HG changeset patch
# User lisaq <lisa@rhodecode.com>
# Date 2016-10-04 14:33:01
# Node ID f30d941107ba26a984469bf8f5d2ce18cfcacb6d
# Parent  53a927b7fe0250b086dfd892595543b735905057

ux: icon for merge tags

diff --git a/rhodecode/templates/changelog/changelog_file_history.html b/rhodecode/templates/changelog/changelog_file_history.html
--- a/rhodecode/templates/changelog/changelog_file_history.html
+++ b/rhodecode/templates/changelog/changelog_file_history.html
@@ -17,7 +17,7 @@
 
                     %if cs.merge:
                         <span class="mergetag">
-                         ${_('merge')}
+                         <i class="icon-merge"></i>${_('merge')}
                         </span>
                     %endif
                     <div class="message_history" title="${cs.message}">
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
@@ -83,7 +83,7 @@
   
             %if c.commit.merge:
               <span class="mergetag tag">
-               ${_('merge')}
+               <i class="icon-merge"></i>${_('merge')}
               </span>
             %endif
   
diff --git a/rhodecode/templates/files/base.html b/rhodecode/templates/files/base.html
--- a/rhodecode/templates/files/base.html
+++ b/rhodecode/templates/files/base.html
@@ -1,7 +1,7 @@
 <%def name="refs(commit)">
     %if commit.merge:
         <span class="mergetag tag">
-         ${_('merge')}
+         <i class="icon-merge">${_('merge')}</i>
         </span>
     %endif