Fixed issue #988: Stash pop/apply fail should have a button for viewing conflicts