mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-17 13:53:39 +00:00
Merge the 3-way merge marker tweak.
This commit is contained in:
parent
fc03d22b17
commit
f515e3f113
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=251895
|
@ -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));
|
||||
|
||||
|
|
Loading…
Reference in a new issue