Merge branch 'bc/unstash-clean-crufts'
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Oct 2011 19:36:17 +0000 (12:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Oct 2011 19:36:17 +0000 (12:36 -0700)
commit9eb765d5f400aa922a46f1727259ce114b78561c
tree74247dd2328d3151340ae632b9ac5dd7e83e3ed4
parent7af4d3468f79c39a75e59aa9699d43d1bbbfd1af
parent7474b8b452f2600bd2a9e03f67b83b489aeadb37
Merge branch 'bc/unstash-clean-crufts'

* bc/unstash-clean-crufts:
  git-stash: remove untracked/ignored directories when stashed
  t/t3905: add missing '&&' linkage
  git-stash.sh: fix typo in error message
  t/t3905: use the name 'actual' for test output, swap arguments to test_cmp
git-stash.sh