diff options
| author | peter <peter@FreeBSD.org> | 2013-06-18 04:56:11 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2013-06-18 04:56:11 +0000 |
| commit | f0343fec502943a8ca06f21bafa447e85ea0a195 (patch) | |
| tree | fd9dad5768dbfb51cf166bbfbe649f638ac57139 /contrib/subversion | |
| parent | cca9ad5b9466d39cb2808b73e3fb7e7eb309528b (diff) | |
| download | FreeBSD-src-f0343fec502943a8ca06f21bafa447e85ea0a195.zip FreeBSD-src-f0343fec502943a8ca06f21bafa447e85ea0a195.tar.gz | |
Merge the 3-way merge marker tweak.
Diffstat (limited to 'contrib/subversion')
| -rw-r--r-- | contrib/subversion/subversion/libsvn_wc/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/subversion/subversion/libsvn_wc/merge.c b/contrib/subversion/subversion/libsvn_wc/merge.c index 7cff3e4..e01c471 100644 --- a/contrib/subversion/subversion/libsvn_wc/merge.c +++ b/contrib/subversion/subversion/libsvn_wc/merge.c @@ -421,7 +421,7 @@ do_text_merge(svn_boolean_t *contains_conflicts, target_marker, right_marker, "=======", /* separator */ - svn_diff_conflict_display_modified_latest, + svn_diff_conflict_display_modified_original_latest, pool)); SVN_ERR(svn_stream_close(ostream)); |
