From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 Jan 2012 20:44:03 +0000 (-0800)
Subject: Merge branch 'jm/stash-diff-disambiguate'
X-Git-Tag: v1.7.9-rc0~2
X-Git-Url: https://git.tokkee.org/?p=git.git;a=commitdiff_plain;h=4a3a1edd0be1c5254ae4fc66e06297d87ef7d530

Merge branch 'jm/stash-diff-disambiguate'

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

4a3a1edd0be1c5254ae4fc66e06297d87ef7d530