mergetools / gvimdiff2on commit tree-walk: finally switch over tree descriptors to contain a pre-parsed entry (7146e66)
   1. "$MERGE_TOOLS_DIR/vimdiff"