Merge branch 'sv/t9801-test-path-is-file-cleanup'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"