On the r1427278 backport branch, merge r1427278, resolving trivial conflict
on adding a comment (which had been edited a couple of times on trunk)
in diff_file.c.


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