diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-11-10 10:01:49 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-11-10 18:10:17 +0000 |
| commit | e2193fe6fdecb46f8bd1ecf40addd3838d0622e5 (patch) | |
| tree | c9318df4be7e85897811678d652b9077357a8ab9 /wiretap/merge.c | |
| parent | 6ae50ebf28cd40d5c7e1ef5493c22e896564c4f2 (diff) | |
| download | wireshark-e2193fe6fdecb46f8bd1ecf40addd3838d0622e5.tar.gz | |
Fix typo.
Change-Id: I417de6124925dbfd9599ec7e90e287eb971457a3
Reviewed-on: https://code.wireshark.org/review/11687
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/merge.c')
| -rw-r--r-- | wiretap/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wiretap/merge.c b/wiretap/merge.c index 9a0ce7cc4e..1d3bebc609 100644 --- a/wiretap/merge.c +++ b/wiretap/merge.c @@ -829,7 +829,7 @@ get_write_error_string(const merge_in_file_t *in_file, const int file_type, /* - * Merges the files base don given input, and invokes callback during + * Merges the files based on given input, and invokes callback during * execution. Returns MERGE_OK on success, or a MERGE_ERR_XXX on failure; note * that the passed-in 'err' variable will be more specific to what failed, and * err_info will have pretty output. |