09a0319c83
Make FreeBSD patches to be port's options and remove separated port. Rename patches to more sane names. Add devel/subversion16 port, for people, who need old version. Mark ports, which could not be built with subversion 1.7.x, as conflicting with new subversion.
12 lines
660 B
Text
12 lines
660 B
Text
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));
|
|
|