mergetools / gvimdiff2on commit Merge branch 'em/newer-freebsd-shells-are-fine-with-returns' into maint (af3a43c)
   1. "$MERGE_TOOLS_DIR/vimdiff"