mergetools / gvimdiff2on commit Merge branch 'sb/unpack-trees-grammofix' into maint (1addc19)
   1. "$MERGE_TOOLS_DIR/vimdiff"