diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-08-05 16:22:51 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-08-05 16:22:51 +0000 |
| commit | cf46733632c7279a9fd0fe6ce26f9185a4ae82a9 (patch) | |
| tree | da27775a2161723ef342e91af41a8b51fedef405 /tools/diff/diff4.c | |
| parent | bb0ef45f7c46b0ae221b26265ef98a768c33f820 (diff) | |
| download | subversion-tarball-master.tar.gz | |
subversion-1.9.7HEADsubversion-1.9.7master
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; |