Merge branch 'mr/doc-clean-f-f'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"