summaryrefslogtreecommitdiff
path: root/mergetools/vim
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-04-10 12:45:35 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-04-10 12:45:35 -0700
commit7945c7fad05da2ac7f6f1f89202799993a591eac (patch)
tree1763e5367ed6d8dd06b6eb1998b32edd09b44043 /mergetools/vim
parentFix git-subtree install instructions (diff)
parentMerge branch 'maint-1.7.9' into maint (diff)
downloadtgif-7945c7fad05da2ac7f6f1f89202799993a591eac.tar.xz
Merge branch 'maint'
* maint: test-subprocess: fix segfault without arguments submodule: fix prototype of gitmodules_config
Diffstat (limited to 'mergetools/vim')
0 files changed, 0 insertions, 0 deletions