Merge branch 'po/everyday-doc'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"