tree 3680a28a6d5296e4d4ef5c110278b818635876fa
parent 53f9a3e157dbbc901a02ac2c73346d375e24978c
author Nicholas Guriev <guriev-ns@ya.ru> 1534136969 +0300
committer Junio C Hamano <gitster@pobox.com> 1534187479 -0700

mergetool: don't suggest to continue after last file

Eliminate an unnecessary prompt to continue after failed merger, by
not calling the prompt_after_failed_merge function when only one
iteration remains.

Uses positional parameters to count files in the list to make it
easier to see if we have any more paths to process from within the
loop.

Signed-off-by: Nicholas Guriev <guriev-ns@ya.ru>
Signed-off-by: Junio C Hamano <gitster@pobox.com>