mergetool: Add prompt to continue after failing to merge a file