Bugfix: conflict-callback should receive a 'repository normal' working-file. (All four files it receives should be 'repository normal', in fact.)
Bugfix: conflict-callback should receive a 'repository normal' working-file.
(All four files it receives should be 'repository normal', in fact.)

* subversion/libsvn_wc/merge.c
  (svn_wc__merge_internal):  pass the detranslated user file to callback,
                             not the original user file!  (This is the same
                             file already used by the diff3 algorithm.)


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

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