![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 6 Jan 2012 20:44:03 +0000 (12:44 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 6 Jan 2012 20:44:03 +0000 (12:44 -0800) |
* jm/stash-diff-disambiguate:
stash: Don't fail if work dir contains file named 'HEAD'
stash: Don't fail if work dir contains file named 'HEAD'
Trivial merge