diff options
Diffstat (limited to 'devel/subversion16/files/extra-patch-3way-conflict-markers')
| -rw-r--r-- | devel/subversion16/files/extra-patch-3way-conflict-markers | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/devel/subversion16/files/extra-patch-3way-conflict-markers b/devel/subversion16/files/extra-patch-3way-conflict-markers new file mode 100644 index 000000000000..0c522c89a948 --- /dev/null +++ b/devel/subversion16/files/extra-patch-3way-conflict-markers @@ -0,0 +1,12 @@ +diff -ruN subversion/libsvn_wc/merge.c subversion/libsvn_wc/merge.c +--- subversion/libsvn_wc/merge.c 2009-02-16 23:35:25.000000000 +0300 ++++ subversion/libsvn_wc/merge.c 2009-04-03 22:11:01.307500000 +0400 +@@ -369,7 +369,7 @@ + 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)); + |