mergetools / vimdiff3on commit Merge branch 'jk/add-p-commentchar-fix' into maint (f904494)
   1. "$MERGE_TOOLS_DIR/vimdiff"