# http://people.freebsd.org/~peter/svn_mergeformat.diff
#
# have the merge conflict generator do a p4-like merge marker
# that displays the original text.
#
Index: subversion/libsvn_wc/merge.c
===================================================================
--- subversion/libsvn_wc/merge.c	(revision 30712)
+++ subversion/libsvn_wc/merge.c	(working copy)
@@ -386,7 +386,7 @@
                                              target_marker,
                                              right_marker,
                                              "=======", /* seperator */
-                                             FALSE, /* display original */
+                                             TRUE, /* display original */
                                              FALSE, /* resolve conflicts */
                                              pool));
           SVN_ERR(svn_stream_close(ostream));