After talking with pburba, tweak some expected results as a followup of my
issue #4305 "Merged directory properties are always added" fix.

I'm not 100% convinced whether the notifications are how we want them,
(with all those duplicates) but for now it reinstates the old behavior
and adds verifications that we won't break it with further merge tweaks.

* subversion/libsvn_client/merge.c
  (merge_file_added,
   merge_dir_added): When merging to the same repository, add added nodes with
    an svn:mergeinfo property to the paths_with_new_mergeinfo hash.

* subversion/tests/cmdline/merge_tests.py
  (no_self_referential_filtering_on_added_path): Remove Wimp.
     Expect double 'G' mergeinfo on C_Moved.

  (merge_adds_subtree_with_mergeinfo): Expect a mergeinfo tweak on
    C/nu.

  (merge_with_added_subtrees_with_mergeinfo): Remove Wimp marker.
    Expect C/X/Y properties to be merged.


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