tree c9bfae45a7a43b6520339c3a421d0994b58dc00a
parent 1be645c0b1b2218d58fbae9dd6174ff2a9d66d57
parent 2d4c99339210d43a84841a71a50e88a050d9e21b
author Junio C Hamano <gitster@pobox.com> 1395431331 -0700
committer Junio C Hamano <gitster@pobox.com> 1395431331 -0700

Merge branch 'jc/stash-pop-not-popped'

"stash pop", upon failing to apply the stash, refrains from
discarding the stash to avoid information loss.  Be more explicit
in the error message.

The wording may want to get a bit more bikeshedding.

* jc/stash-pop-not-popped:
  stash pop: mention we did not drop the stash upon failing to apply