Merge branch 'maint'
authorShawn O. Pearce <spearce@spearce.org>
Tue, 23 Oct 2007 22:50:19 +0000 (18:50 -0400)
committerShawn O. Pearce <spearce@spearce.org>
Tue, 23 Oct 2007 22:50:19 +0000 (18:50 -0400)
commitf4e9996b77415707a20a139463c3e3782e2fa48f
treec26e1fb74f3b94585e5946bcc623b322fd9d2cbe
parentdec2b4aaa87ab2b33d1ad8294872af1f1397ec7e
parentd4e890e5de1ea7107d8d1b4134ab0144bbf27b8c
Merge branch 'maint'

* maint:
  git-gui: Make sure we get errors from git-update-index

Conflicts:

lib/index.tcl
lib/index.tcl