mergetools / vimdiff3on commit Merge branch 'pa/cherry-pick-doc-typo' (1df2d6e)
   1. "$MERGE_TOOLS_DIR/vimdiff"