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

Posted to commits@subversion.apache.org by ju...@apache.org on 2012/07/24 23:24:31 UTC

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

Author: julianfoad
Date: Tue Jul 24 21:24:31 2012
New Revision: 1365295

URL: http://svn.apache.org/viewvc?rev=1365295&view=rev
Log:
* subversion/libsvn_client/merge.c
  (find_reintegrate_merge): Fix doc string.

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=1365295&r1=1365294&r2=1365295&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Tue Jul 24 21:24:31 2012
@@ -10593,8 +10593,7 @@ calculate_left_hand_side(svn_client__pat
 }
 
 /* Determine the URLs and revisions needed to perform a reintegrate merge
- * from SOURCE_PATH_OR_URL at SOURCE_PEG_REVISION into the working
- * copy at TARGET.
+ * from SOURCE_LOC into the working copy at TARGET.
  *
  * SOURCE_RA_SESSION and TARGET_RA_SESSION are RA sessions opened to the
  * source and target branches respectively.