![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Tue, 23 Oct 2007 22:50:19 +0000 (18:50 -0400) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Tue, 23 Oct 2007 22:50:19 +0000 (18:50 -0400) | ||
| commit | f4e9996b77415707a20a139463c3e3782e2fa48f | |
| tree | c26e1fb74f3b94585e5946bcc623b322fd9d2cbe | tree | snapshot |
| parent | dec2b4aaa87ab2b33d1ad8294872af1f1397ec7e | commit | diff |
| parent | d4e890e5de1ea7107d8d1b4134ab0144bbf27b8c | commit | diff |
Merge branch 'maint'
* maint:
git-gui: Make sure we get errors from git-update-index
Conflicts:
lib/index.tcl
* maint:
git-gui: Make sure we get errors from git-update-index
Conflicts:
lib/index.tcl
| lib/index.tcl | diff1 | | diff2 | | blob | history |