[jzwinck]

Weirdly there is no "git stash pop --abort" to roll back when a merge conflict occurs during stash pop.