summaryrefslogtreecommitdiff
path: root/connect.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-08-20 11:33:51 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-08-20 11:33:51 -0700
commit03e904cbd600afee7a39160aabc79a628916eecc (patch)
tree734726ee404a43bebb97e6a036b5ed8a60d7fe5f /connect.c
parentMerge branch 'jt/commit-graph-per-object-store' (diff)
parentmergetool: don't suggest to continue after last file (diff)
downloadtgif-03e904cbd600afee7a39160aabc79a628916eecc.tar.xz
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
Diffstat (limited to 'connect.c')
0 files changed, 0 insertions, 0 deletions