diff options
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. |