Merge branch 'mm/config-edit-global'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"