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

* git://repo.or.cz/git-gui:
  git-gui: tolerate major version changes when comparing the git version
  git-gui: show staged submodules regardless of ignore config

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

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