Merge branch 'js/replace-edit-use-editor-configuration'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"