summaryrefslogtreecommitdiff
path: root/t/t5515/fetch.br-branches-default-octopus
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-11-03 15:32:41 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-11-03 15:32:41 -0800
commit5c15ca0b3c866398f22cbab974d0a1964ef105ca (patch)
treef7c7b00472862c2665c05bf522836b6401dc4e8e /t/t5515/fetch.br-branches-default-octopus
parentMerge branch 'dt/name-hash-dir-entry-fix' into maint (diff)
parentmerge-file: clamp exit code to maximum 127 (diff)
downloadtgif-5c15ca0b3c866398f22cbab974d0a1964ef105ca.tar.xz
Merge branch 'jk/merge-file-exit-code' into maint
"git merge-file" tried to signal how many conflicts it found, which obviously would not work well when there are too many of them. * jk/merge-file-exit-code: merge-file: clamp exit code to maximum 127
Diffstat (limited to 't/t5515/fetch.br-branches-default-octopus')
0 files changed, 0 insertions, 0 deletions