mergetools / vimdiff3on commit Merge branch 'jk/cherry-pick-docfix' into maint (c809f42)
   1. "$MERGE_TOOLS_DIR/vimdiff"