Merge branch 'oh/fix-config-default-user-name-section' into maint-2.3
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"