mergetools / vimdiff2on commit Merge branch 'sb/unpack-trees-grammofix' (0f30315)
   1. "$MERGE_TOOLS_DIR/vimdiff"