From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 20 Aug 2018 18:33:51 +0000 (-0700)
Subject: Merge branch 'ng/mergetool-lose-final-prompt'
X-Git-Tag: v2.19.0-rc0~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=03e904cbd600afee7a39160aabc79a628916eecc;p=thirdparty%2Fgit.git

Merge branch 'ng/mergetool-lose-final-prompt'

"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
---

03e904cbd600afee7a39160aabc79a628916eecc