mergetools / gvimdiffon commit Merge branch 'jc/apply-ws-prefix' into maint (bb6ac5e)
   1. "$MERGE_TOOLS_DIR/vimdiff"