added mercenary for vim-hg integration
using the correct sytax for set shell fixes some issues with vim and fish