Merge branch 'lf/setup-prefix-pathspec' into maint
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"