Andrew's git / gitweb.git / diff
?
Merge branch 'ng/mergetool-lose-final-prompt'
authorJunio C Hamano <gitster@pobox.com>
Mon, 20 Aug 2018 18:33:51 +0000 (11:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Aug 2018 18:33:51 +0000 (11:33 -0700)
"git mergetool" stopped and gave an extra prompt to continue after
the last path has been handled, which did not make much sense.

* ng/mergetool-lose-final-prompt:
mergetool: don't suggest to continue after last file

Trivial merge