mergetools / vimdiff3on commit Merge branch 'xf/user-manual-ff' into maint (684fea3)
   1. "$MERGE_TOOLS_DIR/vimdiff"