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 2011/11/10 10:52:20 UTC

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

Author: julianfoad
Date: Thu Nov 10 09:52:20 2011
New Revision: 1200247

URL: http://svn.apache.org/viewvc?rev=1200247&view=rev
Log:
Remove an empty function added by accident in r1200234.

* subversion/libsvn_client/merge.c
  (svn_client_determine_reintegrate_merge): Delete.

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=1200247&r1=1200246&r2=1200247&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Thu Nov 10 09:52:20 2011
@@ -10584,13 +10584,6 @@ calculate_left_hand_side(const char **ur
   return SVN_NO_ERROR;
 }
 
-/* */
-static svn_error_t *
-svn_client_determine_reintegrate_merge(void)
-{
-  return SVN_NO_ERROR;
-}
-
 static svn_error_t *
 merge_reintegrate_locked(const char *source,
                          const svn_opt_revision_t *peg_revision,