Merge branch 'maint'

* maint:
  git-gui: Fix diff parsing for lines starting with "--" or "++"

diff --cc lib/diff.tcl
Simple merge