Merge branch 'jk/long-paths' into maint-2.2
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"