* subversion/libsvn_client/diff.c (default_conflict_resolver):     #if 0 ... #endif unused code, to avoid breaking -Werror builds with unused     warnings turned on.
* subversion/libsvn_client/diff.c (default_conflict_resolver):
    #if 0 ... #endif unused code, to avoid breaking -Werror builds with unused
    warnings turned on.


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@864109 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion