mergetools / vimdiff3on commit builtin_diff(): read $GIT_DIFF_OPTS closer to use (0da0e92)
   1. "$MERGE_TOOLS_DIR/vimdiff"