Merge branch 'tb/no-relative-file-url'
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"