summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-06-25 13:22:41 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-06-25 13:22:41 -0700
commit90fa1c5d6c00e44f4c901da0cf4015db916eca03 (patch)
treee9f0eeb1227dc47896fbf86ddc63543764bd6daa /builtin/merge.c
parentMerge branch 'sg/update-ref-stdin-cleanup' (diff)
parentt9104: kosherly remove remote refs (diff)
downloadtgif-90fa1c5d6c00e44f4c901da0cf4015db916eca03.tar.xz
Merge branch 'cc/tests-without-assuming-ref-files-backend'
Instead of mucking with filesystem directly, use plumbing commands update-ref etc. to manipulate the refs in the tests. * cc/tests-without-assuming-ref-files-backend: t9104: kosherly remove remote refs
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions