* tools/dist/backport.pl
  (merge): Provide context in error messages.

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