diff options
Diffstat (limited to 'tools/diff/diff4.c')
| -rw-r--r-- | tools/diff/diff4.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/diff/diff4.c b/tools/diff/diff4.c index 084184c..58216a8 100644 --- a/tools/diff/diff4.c +++ b/tools/diff/diff4.c @@ -42,10 +42,11 @@ do_diff4(svn_stream_t *ostream, SVN_ERR(svn_diff_file_diff4_2(&diff, original, modified, latest, ancestor, svn_diff_file_options_create(pool), pool)); - SVN_ERR(svn_diff_file_output_merge2(ostream, diff, + SVN_ERR(svn_diff_file_output_merge3(ostream, diff, original, modified, latest, NULL, NULL, NULL, NULL, svn_diff_conflict_display_modified_latest, + NULL, NULL, /* cancel */ pool)); return NULL; |