Merge branch 'sb/heed-ref-decoration-settings'

* sb/heed-ref-decoration-settings:
  gitk: use config settings for head/tag colors

diff --cc gitk
index 1c289174d517531846e556bf93e7dba61c659ca7,0415abd873633e5e6c523ac5e3e9355bc457e74b..27302749669c21b311be0e0f576f9600a4a858a6
--- 1/gitk
--- 2/gitk
+++ b/gitk
@@@ -6840,8 -6842,8 +6842,8 @@@ proc drawtags {id x xt y1} 
              }
              set xl [expr {$xl - $delta/2}]
              $canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
-                 -width 1 -outline black -fill $col -tags tag.$id
+                 -width 1 -outline $refoutlinecol -fill $reffillcol -tags tag.$id
 -            if {[regexp {^(remotes/.*/|remotes/)} $tag match remoteprefix]} {
 +            if {[regexp {^(remotes/[^/]*/|remotes/)} $tag match remoteprefix]} {
                  set rwid [font measure mainfont $remoteprefix]
                  set xi [expr {$x + 1}]
                  set yti [expr {$yt + 1}]