Merge branch 'js/remote-rename-with-half-configured-remote'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"