use old or new versions of ui.promptchoice
Merge pull request #32 from nick29581/master

handle hg's new version of ui.promptchoice