subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1764112 - /subversion/branches/resolve-incoming-add/subversion/libsvn_client/conflicts.c
Date Mon, 10 Oct 2016 14:55:34 GMT
Author: stsp
Date: Mon Oct 10 14:55:34 2016
New Revision: 1764112

URL: http://svn.apache.org/viewvc?rev=1764112&view=rev
Log:
On the resolve-incoming-add branch:

* subversion/libsvn_client/conflicts.c: Explicitly include svn_diff_tree.h.

Modified:
    subversion/branches/resolve-incoming-add/subversion/libsvn_client/conflicts.c

Modified: subversion/branches/resolve-incoming-add/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/branches/resolve-incoming-add/subversion/libsvn_client/conflicts.c?rev=1764112&r1=1764111&r2=1764112&view=diff
==============================================================================
--- subversion/branches/resolve-incoming-add/subversion/libsvn_client/conflicts.c (original)
+++ subversion/branches/resolve-incoming-add/subversion/libsvn_client/conflicts.c Mon Oct
10 14:55:34 2016
@@ -38,6 +38,8 @@
 #include "svn_hash.h"
 #include "svn_sorts.h"
 #include "client.h"
+
+#include "private/svn_diff_tree.h"
 #include "private/svn_ra_private.h"
 #include "private/svn_sorts_private.h"
 #include "private/svn_token.h"



Mime
View raw message