mergetools / gvimdiffon commit Merge branch 'di/readme-markup-fix' into maint (c8823b4)
   1. "$MERGE_TOOLS_DIR/vimdiff"