summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-07-16 17:42:52 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-07-16 17:42:52 -0700
commitc4670b8a8df58924dbe051f306f53aaf2e549319 (patch)
tree91ffce3ddd84a0895fbe4598db8344d6b6d7872a /merge-recursive.c
parentMerge branch 'rs/khash-alloc-cleanup' (diff)
parentt7509: avoid direct file access for writing CHERRY_PICK_HEAD (diff)
downloadtgif-c4670b8a8df58924dbe051f306f53aaf2e549319.tar.xz
Merge branch 'hn/refs-test-cleanup'
Test clean-up. * hn/refs-test-cleanup: t7509: avoid direct file access for writing CHERRY_PICK_HEAD t1415: avoid direct filesystem access for writing refs
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions