* subversion/svn/main.c:     Fully review and semi-automatically re-line-break the 'svn help merge'     text. Fix another typo. Revamp the 2-URL merge example into an example of     combining two feature branches (inspired by an actual question on     FreeNode's #svn IRC channel by 'Xinil' on Nov. 30th). Rephrase a lot to be     (hopefully) more clear. Tweak some ascii art. There should be no change in     the actual information though. Unindent to fit in 80 chars width and     comment on that.
* subversion/svn/main.c:
    Fully review and semi-automatically re-line-break the 'svn help merge'
    text. Fix another typo. Revamp the 2-URL merge example into an example of
    combining two feature branches (inspired by an actual question on
    FreeNode's #svn IRC channel by 'Xinil' on Nov. 30th). Rephrase a lot to be
    (hopefully) more clear. Tweak some ascii art. There should be no change in
    the actual information though. Unindent to fit in 80 chars width and
    comment on that.


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

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion