mergetools / vimdiff3on commit Merge branch 'pw/add-p-recount' into maint (689204c)
   1. "$MERGE_TOOLS_DIR/vimdiff"