mergetools / vimdiff2on commit unpack_trees: fix breakage when o->src_index != o->dst_index (7db1183)
   1. "$MERGE_TOOLS_DIR/vimdiff"