Merge branch 'js/git-remote-add-url-insteadof-test'
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"