Merge branch 'nf/mergetool-prompt' into HEAD
UI consistency improvements. * nf/mergetool-prompt: difftool/mergetool: make the form of yes/no questions consistent
Junio C Hamano committed
May 18, 2016 at 14:40 UTC
f735a50ffdf0e1734438f0c0e6d70c4a81eea09e
No changes.