Describe merge source normalization, then add/tweak some docstrings and parameter naming/ordering to refer to this explanation.
Describe merge source normalization, then add/tweak some docstrings and
parameter naming/ordering to refer to this explanation.

* subversion/libsvn_client/merge.c
  (MERGEINFO MERGE SOURCE NORMALIZATION): New comment section.
  (drive_merge_report_editor): Reorder parameters, and rename some
    (start -> revision1, end -> revision2).  Add docstring references
    to new comment section.
  (discover_and_merge_children): Parameter rename (rev1 -> revision2,
    rev2 -> revision2).  Add docstring references to new comment
    section.
  (filter_reflected_revisions, calculate_remaining_ranges,
   populate_remaining_ranges, do_merge, do_single_file_merge,
   normalize_merge_sources): Add docstring references to new comment
    section.

git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@867643 13f79535-47bb-0310-9956-ffa450edef68

wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion