You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by cm...@apache.org on 2010/02/19 20:15:42 UTC

svn commit: r911944 - /subversion/trunk/subversion/libsvn_client/merge.c

Author: cmpilato
Date: Fri Feb 19 19:15:41 2010
New Revision: 911944

URL: http://svn.apache.org/viewvc?rev=911944&view=rev
Log:
* subversion/libsvn_client/merge.c
  Indentation tweak only.

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

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=911944&r1=911943&r2=911944&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Fri Feb 19 19:15:41 2010
@@ -4735,11 +4735,11 @@
         }
     }
 
-      /* Temporarily point our second RA session to URL1, too.  We use
-         this to request individual file contents. */
-      SVN_ERR(svn_client__ensure_ra_session_url(&old_sess2_url,
-                                                merge_b->ra_session2,
-                                                url1, pool));
+  /* Temporarily point our second RA session to URL1, too.  We use
+     this to request individual file contents. */
+  SVN_ERR(svn_client__ensure_ra_session_url(&old_sess2_url,
+                                            merge_b->ra_session2,
+                                            url1, pool));
 
   /* Get the diff editor and a reporter with which to, ultimately,
      drive it. */