Merge branch 'maint'
authorShawn O. Pearce <spearce@spearce.org>
Fri, 19 Oct 2007 06:18:21 +0000 (02:18 -0400)
committerShawn O. Pearce <spearce@spearce.org>
Fri, 19 Oct 2007 06:18:21 +0000 (02:18 -0400)
commit7840ce6cb24a9d65152d45e08f5d7cf7dc97a2e3
treeb5de550bb332eabf93b5391ad299bba3e1144fa5
parentf5bf6feb05b8c89c448ded6e6fad0eb58ef35463
parente7187e4e0fece6c2947fbceff251f3ce69ae0aa8
Merge branch 'maint'

* maint:
  Paper bag fix diff invocation in 'git stash show'