subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1727609 - /subversion/trunk/subversion/svn/conflict-callbacks.c
Date Fri, 29 Jan 2016 16:14:53 GMT
Author: stsp
Date: Fri Jan 29 16:14:52 2016
New Revision: 1727609

URL: http://svn.apache.org/viewvc?rev=1727609&view=rev
Log:
* subversion/svn/conflict-callbacks.c
  (svn_cl__interactive_conflict_baton_t): Remove. Has been unused for a while.

Modified:
    subversion/trunk/subversion/svn/conflict-callbacks.c

Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1727609&r1=1727608&r2=1727609&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Fri Jan 29 16:14:52 2016
@@ -48,18 +48,6 @@
 
 
 
-struct svn_cl__interactive_conflict_baton_t {
-  svn_cl__accept_t accept_which;
-  apr_hash_t *config;
-  const char *editor_cmd;
-  svn_boolean_t external_failed;
-  svn_cmdline_prompt_baton_t *pb;
-  const char *path_prefix;
-  svn_boolean_t quit;
-  svn_cl__conflict_stats_t *conflict_stats;
-  svn_boolean_t printed_summary;
-};
-
 svn_cl__accept_t
 svn_cl__accept_from_word(const char *word)
 {



Mime
View raw message