mergetools / gvimdiffon commit Merge branch 'rs/submodule-config-code-cleanup' into maint (f7b01d3)
   1. "$MERGE_TOOLS_DIR/vimdiff"