summaryrefslogtreecommitdiff
path: root/mergetools/vim
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-03-04 22:16:30 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-03-04 22:16:30 -0800
commit26f1e9bd68b6eb32d1376ae392354551c5ae17bc (patch)
tree95022cd5fef1afa3c575f1961156d18d6d090cd1 /mergetools/vim
parenthttp.proxy: also mention https_proxy and all_proxy (diff)
parentt5704: match tests to modern style (diff)
downloadtgif-26f1e9bd68b6eb32d1376ae392354551c5ae17bc.tar.xz
Merge branch 'tr/maint-bundle-long-subject' into maint
* tr/maint-bundle-long-subject: t5704: match tests to modern style strbuf: improve strbuf_get*line documentation bundle: use a strbuf to scan the log for boundary commits bundle: put strbuf_readline_fd in strbuf.c with adjustments
Diffstat (limited to 'mergetools/vim')
0 files changed, 0 insertions, 0 deletions