* subversion/libsvn_client/diff.c   (do_single_file_merge): detect the text state before we call the notify     function.
* subversion/libsvn_client/diff.c
  (do_single_file_merge): detect the text state before we call the notify 
   function.


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

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