Merge branch 'master' into dev

diff --cc gitk
index 09f431b0357f34ec79b42bd790eac65187576d81,f1f21e97bf5e89bd7609cf5b6d1f417e35a43b6c..1dd73f7d8563dd14014c037938bff9358665020b
--- 1/gitk
--- 2/gitk
+++ b/gitk
@@@ -4386,8 -3632,8 +4392,8 @@@ proc drawcmittext {id row col} 
      global linehtag linentag linedtag selectedline
      global canvxmax boldrows boldnamerows fgcolor nullid nullid2
  
-     # listed is 0 for boundary, 1 for normal, 2 for left, 3 for right
+     # listed is 0 for boundary, 1 for normal, 2 for negative, 3 for left, 4 for right
 -    set listed [lindex $commitlisted $row]
 +    set listed $cmitlisted($curview,$id)
      if {$id eq $nullid} {
        set ofill red
      } elseif {$id eq $nullid2} {
@@@ -5771,10 -5029,11 +5777,11 @@@ proc getblobline {bf id} 
      return [expr {$nl >= 1000? 2: 1}]
  }
  
 -proc mergediff {id l} {
 +proc mergediff {id} {
      global diffmergeid mdifffd
      global diffids
 -    global parentlist
 +    global parents
+     global diffcontext
      global limitdiffs viewfiles curview
  
      set diffmergeid $id