mergetools / gvimdiff2on commit Merge branch 'ws/request-pull-code-cleanup' into maint (45f28ed)
   1. "$MERGE_TOOLS_DIR/vimdiff"