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 2016/06/13 13:01:05 UTC

svn commit: r1748214 - /subversion/trunk/subversion/libsvn_client/conflicts.c

Author: stsp
Date: Mon Jun 13 13:01:05 2016
New Revision: 1748214

URL: http://svn.apache.org/viewvc?rev=1748214&view=rev
Log:
* subversion/libsvn_client/conflicts.c
  (resolve_incoming_move_file_text_merge): Indentation fix.

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=1748214&r1=1748213&r2=1748214&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Mon Jun 13 13:01:05 2016
@@ -5701,7 +5701,7 @@ resolve_incoming_move_file_text_merge(sv
                       NULL, NULL, /* diff3_cmd, merge_options */
                       NULL, propdiffs,
                       NULL, NULL, /* conflict func/baton */
-                       NULL, NULL, /* don't allow user to cancel here */
+                      NULL, NULL, /* don't allow user to cancel here */
                       scratch_pool);
   svn_io_sleep_for_timestamps(details->moved_to_abspath, scratch_pool);
   if (err)