* subversion/libsvn_client/repos_diff.c
  (diff_state_handle): Consolidate replacement checks in add notification
    handling. Ignore tree conflict case as a failure to delete will certainly
    raise another tree conflict to add something in its place.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1438938 13f79535-47bb-0310-9956-ffa450edef68
* subversion/libsvn_client/repos_diff.c
  (diff_state_handle): Lose 2 spaces before a huge code block. No functional
    changes.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1438939 13f79535-47bb-0310-9956-ffa450edef68