Merge branch 'mm/status-porcelain-format-i18n-fix'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"