summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-03-17 13:50:23 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-03-17 13:50:24 -0700
commit0bb80ab090fadc99d3d19d23209ddfb7e4f54b3d (patch)
tree5fea17cdffbdfbfdb39c16b0f07ffdeb0495a7cb /ll-merge.c
parentMerge branch 'cc/split-index-config' (diff)
parentt/interop: add test of old clients against modern git-daemon (diff)
downloadtgif-0bb80ab090fadc99d3d19d23209ddfb7e4f54b3d.tar.xz
Merge branch 'jk/interop-test'
Picking two versions of Git and running tests to make sure the older one and the newer one interoperate happily has now become possible. * jk/interop-test: t/interop: add test of old clients against modern git-daemon t: add an interoperability test harness
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions