summaryrefslogtreecommitdiff
path: root/merge-blobs.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-03-21 13:48:54 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-03-21 13:48:54 -0700
commit55a75686061148ea0f9b448cf6e8b0596599eff2 (patch)
tree7c9c6dc0ffa5eab17d0db1bfc7f4bf1ec9b8d880 /merge-blobs.c
parentMerge tag 'l10n-2.26.0-rnd2.1' of git://github.com/git-l10n/git-po.git (diff)
parentt3419: prevent failure when run with EXPENSIVE (diff)
downloadtgif-55a75686061148ea0f9b448cf6e8b0596599eff2.tar.xz
Merge branch 'en/rebase-backend'
Test fix. * en/rebase-backend: t3419: prevent failure when run with EXPENSIVE
Diffstat (limited to 'merge-blobs.c')
0 files changed, 0 insertions, 0 deletions