* subversion/svn/conflict-callbacks.c   (conflict_func_interactive): Rename 'merged_file' to 'merged_abspath'.
* subversion/svn/conflict-callbacks.c
  (conflict_func_interactive): Rename 'merged_file' to 'merged_abspath'.


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

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