* subversion/libsvn_wc/questions.c
* subversion/libsvn_wc/questions.c

  (svn_wc_conflicted_p): Bug fix.  Old code would allow us to claim
  that a file had no text conflicts if it's "old" conflict file had
  been removed (but the other two remained).

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion