# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1428011460 18000
# Node ID d7cf8102bf09a905662c1018e60a06e417a08af3
# Parent  517f3e190a5d32539827e6171ce450bad8d3557b# Parent  e1842ef61edbdb5725112a968adeb9990436c15d
merge with stable

diff -r 517f3e190a5d -r d7cf8102bf09 mercurial/templates/monoblue/map
--- a/mercurial/templates/monoblue/map	Wed Apr 01 22:24:03 2015 -0700
+++ b/mercurial/templates/monoblue/map	Thu Apr 02 16:51:00 2015 -0500
@@ -103,7 +103,7 @@
 difflineplus = '<span class="difflineplus"><a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</span>'
 difflineminus = '<span class="difflineminus"><a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</span>'
 difflineat = '<span class="difflineat"><a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</span>'
-diffline = '<a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}'
+diffline = '<span><a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</span>'
 
 comparisonblock ='
   <tbody class="block">