Merge branch 'master' into new

Conflicts:

gitk

diff --cc gitk
index 7c8ad595c04537369b4c13e94fa0eadb93ea05be,101cf9bd9ff8c3b8180ab50e6ceb4655576f9fbf..25c86b70af6284eacd079e508f97f16d03f3f88d
--- 1/gitk
--- 2/gitk
+++ b/gitk
@@@ -382,9 -380,7 +382,9 @@@ proc makewindow {} 
      global findtype findtypemenu findloc findstring fstring geometry
      global entries sha1entry sha1string sha1but
      global maincursor textcursor curtextcursor
-     global rowctxmenu mergemax
+     global rowctxmenu mergemax wrapcomment
 +    global highlight_files gdttype
 +    global searchstring sstring
  
      menu .bar
      .bar add cascade -label "File" -menu .bar.file
@@@ -5325,7 -4893,9 +5326,8 @@@ set fastdate 
  set uparrowlen 7
  set downarrowlen 7
  set mingaplen 30
 -set flistmode "flat"
  set cmitmode "patch"
+ set wrapcomment "none"
  
  set colors {green red blue magenta darkgrey brown orange}