mergetools / gvimdiff2on commit Merge branch 'jk/execv-dashed-external' into maint (5816d3c)
   1. "$MERGE_TOOLS_DIR/vimdiff"