Merge branch 'mp/complete-paths'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"