Merge branch 'jk/smart-http-hide-refs' into maint
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"