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