Merge branch 'xf/user-manual-ff'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"