diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2020-05-31 20:58:28 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2020-05-31 20:58:28 +0000 |
| commit | bbee6e0814d5875b85b81f26fd4ca7a28b6f9570 (patch) | |
| tree | 726fcf32b39ca8976d7aa51b67c7236509f1bde4 /subversion/include/svn_diff.h | |
| parent | 38cef28c88864beaadac7a7cffdec6da952c3eb2 (diff) | |
Notes
Diffstat (limited to 'subversion/include/svn_diff.h')
| -rw-r--r-- | subversion/include/svn_diff.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/subversion/include/svn_diff.h b/subversion/include/svn_diff.h index bd2c97084bfb..61f4b77f1eb3 100644 --- a/subversion/include/svn_diff.h +++ b/subversion/include/svn_diff.h @@ -711,7 +711,7 @@ svn_diff_file_output_unified(svn_stream_t *output_stream, * @a conflict_latest to be displayed as conflict markers in the output. * If @a conflict_original, @a conflict_modified, @a conflict_latest and/or * @a conflict_separator is @c NULL, a default marker will be displayed. - * @a conflict_style dictates how conflicts are displayed. + * @a conflict_style dictates how conflicts are displayed. * Uses @a scratch_pool for temporary allocations. * * If not @c NULL, call @a cancel_func with @a cancel_baton once or multiple |