Follow up to r35578.
Follow up to r35578.

* subversion/libsvn_client/merge.c
  (merge_cousins_and_supplement_mergeinfo, svn_client_merge3,
   svn_client_merge_peg3): Do uuid comparison iff the repository roots do not
   match.

Suggested by: rhuijben
Review by: rhuijben


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

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