Followup to r11479 to fix issue 1943.  Make merge_cmd_baton.added_path track the last dir added to a versioned dir.
Followup to r11479 to fix issue 1943.  Make merge_cmd_baton.added_path
track the last dir added to a versioned dir.

* subversion/libsvn_client/diff.c
  (struct merge_cmd_baton): Tweak comment.
  (merge_dir_added): Simplify setting of added_dir.

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