Follow up to r1337579:
Follow up to r1337579:

* subversion/libsvn_wc/conflicts.c
  (resolve_conflict_on_node): Guard against NULL-pointer derefence as this
    code did before I made it use a work queue. It seems strange that so
    many variables in this function are allowed to be NULL but I'll revisit
    that later.

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