Project: Subversion

Revision: 32925

Author: arfrever

Date: 05 Sep 2008 10:08:46

• /trunk/subversion/libsvn_wc/merge.c

  ......	@@ -2,7 +2,7 @@
  2	2	* merge.c: merging changes into a working file
  3	3	*
  4	4	* ====================================================================
  5		* Copyright (c) 2000-2006 CollabNet. All rights reserved.
  	5	* Copyright (c) 2000-2006, 2008 CollabNet. All rights reserved.
  6	6	*
  7	7	* This software is licensed as described in the file COPYING, which
  8	8	* you should have received as part of this distribution. The terms
  ......	@@ -378,15 +378,14 @@
  378	378	else
  379	379	right_marker = ">>>>>>> .new";
  380	380
  381		SVN_ERR(svn_diff_file_output_merge(ostream, diff,
  382		left, tmp_target, right,
  383		left_marker,
  384		target_marker,
  385		right_marker,
  386		"=======", /* seperator */
  387		FALSE, /* display original */
  388		FALSE, /* resolve conflicts */
  389		pool));
  	381	SVN_ERR(svn_diff_file_output_merge2(ostream, diff,
  	382	left, tmp_target, right,
  	383	left_marker,
  	384	target_marker,
  	385	right_marker,
  	386	"=======", /* seperator */
  	387	svn_diff_conflict_display_modified_latest,
  	388	pool));
  390	389	SVN_ERR(svn_stream_close(ostream));
  391	390
  392	391	contains_conflicts = svn_diff_contains_conflicts(diff);