Merge branch 'pk/stash-apply-status-relative' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 1 Apr 2011 23:23:43 +0000 (16:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 1 Apr 2011 23:23:43 +0000 (16:23 -0700)
* pk/stash-apply-status-relative:
  Add test: git stash shows status relative to current dir
  git stash: show status relative to current directory

1  2 
git-stash.sh

diff --cc git-stash.sh
Simple merge