summaryrefslogtreecommitdiff
path: root/mergetools/p4merge
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2013-01-10 12:54:27 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-01-10 14:58:54 -0800
commit9a6dcb37bd13f6c6001181a90b0811ca56f154b0 (patch)
tree6f68810d47b71394e06ea18cccb7efd40bc6b20f /mergetools/p4merge
parentGit 1.7.12.4 (diff)
downloadtgif-9a6dcb37bd13f6c6001181a90b0811ca56f154b0.tar.xz
contrib/vim: simplify instructions for old vim support
Rely on the upstream filetype.vim instead of duplicating its rules in git's instructions for syntax highlighting support on pre-7.2 vim versions. The result is a shorter contrib/vim/README. More importantly, it lets us punt on maintenance of the autocmd rules. So now when we fix the upstream gitsendemail rule in light of commit eed6ca7, new git users stuck on old vim reading contrib/vim/README can automagically get the fix without any further changes needed to git. Once the world has moved on to vim 7.2+ completely, we can get rid of these instructions, but for now if they are this simple it's effortless to keep them. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/p4merge')
0 files changed, 0 insertions, 0 deletions