Code

Merge branch 'jm/stash-diff-disambiguate'
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Jan 2012 20:44:03 +0000 (12:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Jan 2012 20:44:03 +0000 (12:44 -0800)
commit4a3a1edd0be1c5254ae4fc66e06297d87ef7d530
tree8aa05c695e7db70270d1473f40c4db0409f1d9d2
parent1067f8dd0eef81062f740ba4bc680ac9649a0d42
parent44df2e297025d7a9af6c265dfefb687b09e2537a
Merge branch 'jm/stash-diff-disambiguate'

* jm/stash-diff-disambiguate:
  stash: Don't fail if work dir contains file named 'HEAD'