You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by st...@apache.org on 2011/08/06 10:44:10 UTC

svn commit: r1154461 - /subversion/trunk/subversion/libsvn_wc/merge.c

Author: steveking
Date: Sat Aug  6 08:44:10 2011
New Revision: 1154461

URL: http://svn.apache.org/viewvc?rev=1154461&view=rev
Log:
* subversion/libsvn_wc/merge.c
  (setup_text_conflict_desc): initialize the is_binary struct member with the
  parameter passed for it.

Modified:
    subversion/trunk/subversion/libsvn_wc/merge.c

Modified: subversion/trunk/subversion/libsvn_wc/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/merge.c?rev=1154461&r1=1154460&r2=1154461&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/merge.c (original)
+++ subversion/trunk/subversion/libsvn_wc/merge.c Sat Aug  6 08:44:10 2011
@@ -814,7 +814,7 @@ setup_text_conflict_desc(const char *lef
   svn_wc_conflict_description2_t *cdesc;
 
   cdesc = svn_wc_conflict_description_create_text2(target_abspath, pool);
-  cdesc->is_binary = FALSE;
+  cdesc->is_binary = is_binary;
   cdesc->mime_type = (mimeprop && mimeprop->value)
                      ? mimeprop->value->data : NULL,
   cdesc->base_abspath = left_abspath;