mergetools / gvimdiff3on commit *.sh: respect $GIT_INDEX_FILE (c697b57)
   1. "$MERGE_TOOLS_DIR/vimdiff"