Merge https://github.com/j6t/git-gui

* 'master' of https://github.com/j6t/git-gui:
  git-gui: use system encoding to show console output
  git-gui: Remove forced rescan of stat-dirty files.

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

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

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