vim-promiscuous
vim-promiscuous copied to clipboard
Abort stash pop if there are merge conflicts
Also figure out if this is an issue with WIP commits