mergetools / gvimdiff3on commit Merge branch 'ew/server-info-remove-crufts' into maint (776d668)
   1. "$MERGE_TOOLS_DIR/vimdiff"