mergetools / gvimdiff2on commit fast-import: rename mem_pool type to mp_block (7dc0656)
   1. "$MERGE_TOOLS_DIR/vimdiff"