summaryrefslogtreecommitdiff
path: root/gitweb
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2007-05-23 00:16:11 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2007-05-23 00:16:11 -0700
commite97593693ed36da918413732c9ca4b09c3e9d213 (patch)
tree9c06adffc5bf959829e20024fdadc4c9f8d9e230 /gitweb
parentMerge branch 'mc/ws' (diff)
parentMerge branch 'maint-1.5.1' into maint (diff)
downloadtgif-e97593693ed36da918413732c9ca4b09c3e9d213.tar.xz
Merge branch 'maint'
* maint: Document branch.autosetupmerge.
Diffstat (limited to 'gitweb')
0 files changed, 0 insertions, 0 deletions