From Michael Mann:

[metze/wireshark/wip.git] / mergecap.c

diff --git a/mergecap.c b/mergecap.c
index bb95f2aaf3d2be86ccbe00f9ea76f925a028f4b9..db3873ef869889cacfcec6f998b3967219956baf 100644 (file)
--- a/mergecap.c
+++ b/mergecap.c
@@ -124,7 +124,7 @@ usage(void)
   fprintf(stderr, "                    default is to merge based on frame timestamps.\n");
   fprintf(stderr, "  -s <snaplen>      truncate packets to <snaplen> bytes of data.\n");
   fprintf(stderr, "  -w <outfile>|-    set the output filename to <outfile> or '-' for stdout.\n");
-  fprintf(stderr, "  -F <capture type> set the output file type; default is libpcap.\n");
+  fprintf(stderr, "  -F <capture type> set the output file type; default is pcapng.\n");
   fprintf(stderr, "                    an empty \"-F\" option will list the file types.\n");
   fprintf(stderr, "  -T <encap type>   set the output file encapsulation type;\n");
   fprintf(stderr, "                    default is the same as the first input file.\n");