Pop stashed changes on pull error.
Merge pull request #38 from jamiew/rollback

Pop stashed changes on pull error