summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorLibravatar Nicholas Guriev <guriev-ns@ya.ru>2018-08-13 08:09:29 +0300
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-08-13 12:11:19 -0700
commitd651a54b8a22a307f5b061ba50c5348ae31e861c (patch)
tree3680a28a6d5296e4d4ef5c110278b818635876fa /contrib
parentGit 2.18 (diff)
downloadtgif-d651a54b8a22a307f5b061ba50c5348ae31e861c.tar.xz
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>
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions