Merge branch 'maint'
commitf31c14b30b49f76330e6e7c192865e0230dec8c9
authorShawn O. Pearce <spearce@spearce.org>
Sat, 22 Sep 2007 02:03:27 +0000 (21 22:03 -0400)
committerShawn O. Pearce <spearce@spearce.org>
Sat, 22 Sep 2007 02:03:27 +0000 (21 22:03 -0400)
tree5d174c3f915fb445052ed92600f7bbbe2b308441
parent2f7c9a7f310dae23989b4acd49514abc58334e5b
parent2fe167b67a479b19e52b974f9518436565e6793b
Merge branch 'maint'

* maint:
  git-gui: Ensure .git/info/exclude is honored in Cygwin workdirs
  git-gui: Handle starting on mapped shares under Cygwin
  git-gui: Display message box when we cannot find git in $PATH

Conflicts:

git-gui.sh
git-gui.sh