Author: rinrab
Date: Wed Nov 27 13:01:24 2024
New Revision: 1922159
URL: http://svn.apache.org/viewvc?rev=1922159&view=rev
Log:
In the trunk, merge.c: Do not prefix the type of the `source` variable with
`struct` keyword; svn_client__merge_source_t is a typedef.
* subversion/libsvn_client/merge.c
(record_tree_conflict): Ditto.
No functional changes.
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=1922159&r1=1922158&r2=1922159&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Wed Nov 27 13:01:24 2024
@@ -1428,7 +1428,7 @@ record_tree_conflict(merge_cmd_baton_t *
if (HONOR_MERGEINFO(merge_b) && merge_b->merge_source.ancestral)
{
- struct svn_client__merge_source_t *source;
+ svn_client__merge_source_t *source;
svn_client__pathrev_t *loc1;
svn_client__pathrev_t *loc2;
svn_revnum_t start_rev;
