From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 3 May 2016 21:08:17 +0000 (-0700)
Subject: Merge branch 'nf/mergetool-prompt'
X-Git-Tag: v2.9.0-rc0~74
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b97414352746967c72e5b87cce39efea4b93e2bf

Merge branch 'nf/mergetool-prompt'

UI consistency improvements.

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

b97414352746967c72e5b87cce39efea4b93e2bf