Remove a redundant check.
Remove a redundant check.

* subversion/libsvn_client/merge.c
  (tree_conflict): Don't check for an existing tree conflict before adding a
    new one.  The add_tree_conflict() API does this for us.


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

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