Merge branch 'nf/mergetool-prompt'

UI consistency improvements. * nf/mergetool-prompt: difftool/mergetool: make the form of yes/no questions consistent

Junio C Hamano committed May 3, 2016 at 14:08 UTC b97414352746967c72e5b87cce39efea4b93e2bf

No changes.