From: Junio C Hamano 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: https://git.lorimer.id.au/gitweb.git/diff_plain/03e904cbd600afee7a39160aabc79a628916eecc?hp=03e904cbd600afee7a39160aabc79a628916eecc 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 ---