r1245285 | stsp | 2012-02-17 01:47:16 +0000 (Fri, 17 Feb 2012) Follow-up to r1245284: * subversion/libsvn_client/merge.c: Include svn_subst.h. Found by: Windows Buildbot