* subversion/svn/conflict-callbacks.c   (show_diff): Add a merged_file argument and stop pulling the merged file    path out of the conflict descriptor.   (handle_text_conflict): Pass the merged file path to show_diff() explicitly.
* subversion/svn/conflict-callbacks.c
  (show_diff): Add a merged_file argument and stop pulling the merged file
   path out of the conflict descriptor.
  (handle_text_conflict): Pass the merged file path to show_diff() explicitly.


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

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion