* subversion/libsvn_wc/conflicts.c   (resolve_one_conflict): Initialize a variable which only gets set     conditionally within this function.
* subversion/libsvn_wc/conflicts.c
  (resolve_one_conflict): Initialize a variable which only gets set
    conditionally within this function.

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