Merge branch 'jm/stash-diff-disambiguate'

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

Junio C Hamano committed Jan 6, 2012 at 12:44 UTC 4a3a1edd0be1c5254ae4fc66e06297d87ef7d530

No changes.