* subversion/libsvn_client/repos_diff.c   (close_file): Fix duplicate notification for tree-conflict with incoming     replace (file replaced with file), possibly others. This case is visible     in merge_tests.py merge_replace_causes_tree_conflict2 (135) on file     A/mu during the final merge: there was an additional "A" notification     for A/mu. (Test still XFails for various status imperfections.)
* subversion/libsvn_client/repos_diff.c
  (close_file): Fix duplicate notification for tree-conflict with incoming
    replace (file replaced with file), possibly others. This case is visible
    in merge_tests.py merge_replace_causes_tree_conflict2 (135) on file
    A/mu during the final merge: there was an additional "A" notification
    for A/mu. (Test still XFails for various status imperfections.)

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