Merge branch 'maint'
authorShawn O. Pearce <spearce@spearce.org>
Tue, 3 Jul 2007 14:42:43 +0000 (10:42 -0400)
committerShawn O. Pearce <spearce@spearce.org>
Tue, 3 Jul 2007 14:42:43 +0000 (10:42 -0400)
* maint:
  git-gui: properly popup error if gitk should be started but is not installed

1  2 
git-gui.sh

diff --cc git-gui.sh
Simple merge