summaryrefslogtreecommitdiff
path: root/merge-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-11-12 22:27:49 -0800
committerJunio C Hamano <gitster@pobox.com>2008-11-12 22:27:49 -0800
commitac538e5dbaf13180b7e7a9c4471f1007b8b11d68 (patch)
treee481fb7d6551226b5b84db9277cb481eb5ad376f /merge-tree.c
parent3e9f158c804776f6a7a42bef582a38909d3e920d (diff)
parentc752a0e00c7f122dbca72552b1bf193e5850a1b1 (diff)
downloadgit-ac538e5dbaf13180b7e7a9c4471f1007b8b11d68.tar.gz
Merge branch 'gb/gitweb-snapshot-pathinfo'
* gb/gitweb-snapshot-pathinfo: gitweb: embed snapshot format parameter in PATH_INFO gitweb: retrieve snapshot format from PATH_INFO gitweb: make the supported snapshot formats array global
Diffstat (limited to 'merge-tree.c')
0 files changed, 0 insertions, 0 deletions