Resolve conflicts.

This commit is contained in:
Bill Fenner 1999-01-20 05:13:42 +00:00
parent 665a129826
commit bc32f7a3d2
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=42884
2 changed files with 690 additions and 279 deletions

View File

@ -29,7 +29,7 @@
.\" Copyright (c) 1988 The Regents of the University of California.
.\" All rights reserved.
.\"
.\" mtrace.8,v 5.1 1996/12/19 21:31:26 fenner Exp
.\" mtrace.8,v 5.2 1998/12/04 04:48:16 fenner Exp
.\"
.Dd May 8, 1995
.Dt MTRACE 8
@ -80,7 +80,7 @@ host name or address. The default
.Ar receiver
is the host running mtrace, and the default
.Ar group
is "MBone Audio" (224.2.0.1), which is sufficient if packet loss
is 0.0.0.0, which is sufficient if packet loss
statistics for a particular multicast group are not needed. These two
optional parameters may be specified to test the path to some other
receiver in a particular group, subject to some constraints as

File diff suppressed because it is too large Load Diff