summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-10-12 13:51:27 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-10-12 13:51:27 -0700
commit9b338cbefdfada94f51075d9013f0c77d74f95a3 (patch)
tree8d023203ce1a1c64b0f65d17de904db478d91ffa /merge-recursive.c
parentMerge branch 'ab/ls-remote-packet-trace' into maint (diff)
parentrebase: emit one "fatal" in "fatal: fatal: <error>" (diff)
downloadtgif-9b338cbefdfada94f51075d9013f0c77d74f95a3.tar.xz
Merge branch 'ab/rebase-fatal-fatal-fix' into maint
Error message fix. * ab/rebase-fatal-fatal-fix: rebase: emit one "fatal" in "fatal: fatal: <error>"
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions