Merge branch 'po/rerere-doc-fmt'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"