mergetools / gvimdiff2on commit alloc: make allocate_alloc_state and clear_alloc_state more consistent (1731310)
   1. "$MERGE_TOOLS_DIR/vimdiff"