From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 May 2016 21:40:07 +0000 (-0700)
Subject: Merge branch 'nf/mergetool-prompt' into HEAD
X-Git-Tag: v2.8.3~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f735a50ffdf0e1734438f0c0e6d70c4a81eea09e;p=thirdparty%2Fgit.git

Merge branch 'nf/mergetool-prompt' into HEAD

UI consistency improvements.

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

f735a50ffdf0e1734438f0c0e6d70c4a81eea09e