subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1765161 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Date Sun, 16 Oct 2016 14:42:44 GMT
Author: stsp
Date: Sun Oct 16 14:42:43 2016
New Revision: 1765161

URL: http://svn.apache.org/viewvc?rev=1765161&view=rev
Log:
* subversion/libsvn_client/conflicts.c
  (svn_client_conflict_text_resolve_by_id): Shorten a commend and simplify
   nested a if-statement. No functional change.

Modified:
    subversion/trunk/subversion/libsvn_client/conflicts.c

Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1765161&r1=1765160&r2=1765161&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Sun Oct 16 14:42:43 2016
@@ -8908,18 +8908,14 @@ svn_client_conflict_text_resolve_by_id(
                                                  option_id);
 
   /* Support svn_client_conflict_option_merged_text for binary conflicts by
-   * mapping this onto the semantically equal
-   * svn_client_conflict_option_working_text.
-   */
-  if (option == NULL)
-  {
-    if (option_id == svn_client_conflict_option_merged_text) {
+   * mapping this option to svn_client_conflict_option_working_text. */
+  if (option == NULL && option_id == svn_client_conflict_option_merged_text)
+    {
       mime_type = svn_client_conflict_text_get_mime_type(conflict);
       if (mime_type && svn_mime_type_is_binary(mime_type))
         option = svn_client_conflict_option_find_by_id(resolution_options,
                    svn_client_conflict_option_working_text);
     }
-  }
 
   if (option == NULL)
       return svn_error_createf(SVN_ERR_CLIENT_CONFLICT_OPTION_NOT_APPLICABLE,



Mime
View raw message