tree 8aa05c695e7db70270d1473f40c4db0409f1d9d2
parent 1067f8dd0eef81062f740ba4bc680ac9649a0d42
parent 44df2e297025d7a9af6c265dfefb687b09e2537a
author Junio C Hamano <gitster@pobox.com> 1325882643 -0800
committer Junio C Hamano <gitster@pobox.com> 1325882643 -0800

Merge branch 'jm/stash-diff-disambiguate'

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