git.samba.org
/
obnox
/
wireshark
/
wip.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
From Clemens Auer:
[obnox/wireshark/wip.git]
/
doc
/
mergecap.pod
diff --git
a/doc/mergecap.pod
b/doc/mergecap.pod
index b842584ba4b5aab4b688636273c2e8139d4a7512..44a6c214a48cca3b431d542148a73b380f20c749 100644
(file)
--- a/
doc/mergecap.pod
+++ b/
doc/mergecap.pod
@@
-132,8
+132,6
@@
seconds.)
editcap -t 136272376 b.pcap b-shifted.pcap
mergecap -w compare.pcap a.pcap b-shifted.pcap
-=back
-
=head1 SEE ALSO
tcpdump(8), pcap(3), wireshark(1), tshark(1), dumpcap(1), editcap(1),