From: Shawn O. Pearce <spearce@spearce.org>
Date: Fri, 19 Oct 2007 06:18:21 +0000 (-0400)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.4-rc0~337
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7840ce6cb24a9d65152d45e08f5d7cf7dc97a2e3;p=git.git

Merge branch 'maint'

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

7840ce6cb24a9d65152d45e08f5d7cf7dc97a2e3