Create 1.7.x backport branch for issue 4270.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-issue4270@1433737 13f79535-47bb-0310-9956-ffa450edef68
On the '1.7.x-issue4270' branch: merge r1427197 from trunk.

Resolved a trivial conflict on deleting a line which had changed on trunk.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-issue4270@1433740 13f79535-47bb-0310-9956-ffa450edef68
On the '1.7.x-issue4270' branch: merge r1427210 from trunk.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-issue4270@1433741 13f79535-47bb-0310-9956-ffa450edef68
Merge the 1.7.x-issue4270 branch back into 1.7.x.

 * r1427197, r1427210
   Fix issue #4270 'diff -cN shows wrong line changed'.  In the optimized
   code path (unaligned access) for prefix/suffix scanning, the diff would
   be incorrect when a '\r' is not immediately followed by a '\n'.
   Justification:
     Diff should show the correct changes. Failure to do so can lead to
     incorrect updates/merges (because diff3 suffers from the same bug).
   Branch:
     ^/subversion/branches/1.7.x-issue4270
   Votes:
     +1: jcorvel, rhuijben, stsp


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1485342 13f79535-47bb-0310-9956-ffa450edef68