Merge branch 'jt/avoid-ls-refs-with-http'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"