mergetools / vimdiff3on commit Merge branch 'pw/add-p-select' into next (eae69f5)
   1. "$MERGE_TOOLS_DIR/vimdiff"