Merge branch 'maint'
commitf10c1c77430e57a9d506848a34758ee93a77b8b5
authorShawn O. Pearce <spearce@spearce.org>
Tue, 3 Jul 2007 14:42:43 +0000 (3 10:42 -0400)
committerShawn O. Pearce <spearce@spearce.org>
Tue, 3 Jul 2007 14:42:43 +0000 (3 10:42 -0400)
tree5d54ee2bfc84b9b36aa5ae90bf37c40e6a0af456
parent03d25622a5c0f8d0fc4030f3114974d86f20fd61
parent7aecb128779ffd8258f01f4382df963900ae6acd
Merge branch 'maint'

* maint:
  git-gui: properly popup error if gitk should be started but is not installed
git-gui.sh