* subversion/include/svn_diff.h
* subversion/include/svn_diff.h

  (output_conflict, output_diff_modified): Swap the positions of these
    functions in the svn_diff_output_fns_t vtable.  Update the documentation.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion