mergetools / gvimdiffon commit submodule: don't rely on overlayed config when setting diffopts (fdfa9e9)
   1. "$MERGE_TOOLS_DIR/vimdiff"