* subversion/libsvn_client/merge.c   (merge_dir_added): Use an if...else instead of two if's which check mutually   exclusive conditions.
* subversion/libsvn_client/merge.c
  (merge_dir_added): Use an if...else instead of two if's which check mutually
  exclusive conditions.

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