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/03/14 16:14:26 UTC

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

Author: julianfoad
Date: Wed Mar 14 15:14:26 2012
New Revision: 1300584

URL: http://svn.apache.org/viewvc?rev=1300584&view=rev
Log:
* subversion/libsvn_client/merge.c
  (find_reintegrate_merge): Tweak doc string. A follow-up to r1300583.

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=1300584&r1=1300583&r2=1300584&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Wed Mar 14 15:14:26 2012
@@ -10410,6 +10410,7 @@ calculate_left_hand_side(const char **ur
  * opened to the target and source branches respectively.  Set *SOURCE_P to
  * the source-left and source-right locations of the required merge.  Set
  * *YC_ANCESTOR_REV_P to the revision number of the youngest ancestor.
+ * Any of these output pointers may be NULL if not wanted.
  *
  * See svn_client_find_reintegrate_merge() for other details.
  */