mergetools / gvimdiff2on commit submodule.c: use the right index instead of the_index (68f08b4)
   1. "$MERGE_TOOLS_DIR/vimdiff"