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