Index: build.conf
===================================================================
--- build.conf	(revision 1783959)
+++ build.conf	(working copy)
@@ -1712,4 +1712,4 @@
 type = exe
 path = tools/client-side/svnconflict
 install = tools
-libs = libsvn_client libsvn_wc libsvn_ra libsvn_subr apriconv apr
+libs = libsvn_client libsvn_wc libsvn_diff libsvn_delta libsvn_ra libsvn_subr apriconv apr