Ability to use external merging tool for unshelve conflicts
Created originally on Bitbucket by Gili
Right now if a unshelve operation fails, we are forced to use the built-in merge tool which is quite primitive. I would like to be able to use an external diff/merge tool like Beyond Compare.