Remove an unneeded wc_db call in the conflict resolver code. This was just used to calculate a parent path, that was not really used.
Remove an unneeded wc_db call in the conflict resolver code. This was just used
to calculate a parent path, that was not really used.

* subversion/libsvn_wc/conflicts.c
  (resolve_conflict_on_node): Don't calculate the conflict dir, as we no longer
    need that. Joining an absolute temp path to this directory just leaves the
    absolute temp path.


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

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion