Merge branch 'maint'

* maint:
  git-gui: Fix diff parsing for lines starting with "--" or "++"
tree: 0fa5fd758089f21623f36acdb8f1217baccc7cff
  1. lib/
  2. macosx/
  3. po/
  4. windows/
  5. .gitignore
  6. git-gui.sh
  7. GIT-VERSION-GEN
  8. Makefile