d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge the 3-way merge marker tweak.

Browse Source
This commit is contained in:
Peter Wemm 2013-06-18 04:56:11 +00:00
parent fc03d22b17
commit f515e3f113
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=251895
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/subversion/subversion/libsvn_wc/merge.c
View File

@ -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));