Merge git://repo.or.cz/git-gui

* git://repo.or.cz/git-gui:
  git-gui: suppress RenderBadPicture X error caused by Tk bug
  git-gui: Increase blame viewer usability on MacOS.
  git-gui: search 4 directories to improve statistic of gc hint
  git gui: make current branch default in "remote delete branch" merge check

diff --cc git-gui/git-gui.sh
Simple merge

diff --cc git-gui/lib/blame.tcl
Simple merge

diff --cc git-gui/lib/database.tcl
Simple merge

diff --cc git-gui/lib/remote_branch_delete.tcl
Simple merge