mergetools / gvimdiff2on commit Merge branch 'sb/submodule-config-parse-ignore-fix' into maint (f3d5bbb)
   1. "$MERGE_TOOLS_DIR/vimdiff"