* subversion/libsvn_delta/diff.c
* subversion/libsvn_delta/diff.c

  (svn_diff3): Break the ring created to do the possible conflict resolution,
    bringing the list in its original state.  This fixes a looping problem
    reported by cmpilato.


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

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