Merge branch 'ow/config-mailmap-pathname'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"