summaryrefslogtreecommitdiff
path: root/mergetools/vimdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-06-20 11:01:02 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-06-20 11:01:02 -0700
commit8699b74ae1190b90facdbe83a879251c8a9e07ac (patch)
treef92ce3547ca3bdd0e39ae3e245489dce74489b93 /mergetools/vimdiff
parentMerge branch 'jc/clear-pathspec' (diff)
parentuserdiff: add built-in pattern for CSS (diff)
downloadtgif-8699b74ae1190b90facdbe83a879251c8a9e07ac.tar.xz
Merge branch 'wd/userdiff-css'
Update the funcname definition to support css files. * wd/userdiff-css: userdiff: add built-in pattern for CSS
Diffstat (limited to 'mergetools/vimdiff')
0 files changed, 0 insertions, 0 deletions