mergetools / vimdiff3on commit Merge branch 'jk/more-comments-on-textconv' (3ed26a4)
   1. "$MERGE_TOOLS_DIR/vimdiff"