backport.pl: Sanitify backup-diff generation.  No functional change.

* tools/dist/backport.pl
  (merge): Concentrate all the logic governing the backup diff in one place.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1569239 13f79535-47bb-0310-9956-ffa450edef68