mergetools / gvimdiffon commit Merge branch 'sd/t3200-typofix' into maint (e06b421)
   1. "$MERGE_TOOLS_DIR/vimdiff"