summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-09-08 13:30:31 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-09-08 13:30:31 -0700
commit85246a7054a6d20a1dc7ccc31e382493332374a4 (patch)
tree29820e2f1ee4af275563593b1f321fda408f22cd /builtin/merge.c
parentMerge branch 'mh/credential-leakfix' (diff)
parentt6300: check for cat-file exit status code (diff)
downloadtgif-85246a7054a6d20a1dc7ccc31e382493332374a4.tar.xz
Merge branch 'dd/t6300-wo-gpg-fix'
Test fix. * dd/t6300-wo-gpg-fix: t6300: check for cat-file exit status code t6300: don't run cat-file on non-existent object
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions