mergetools / vimdiff3on commit Merge branch 'xf/user-manual-markup' into maint (6c66686)
   1. "$MERGE_TOOLS_DIR/vimdiff"