backport.pl: preserve local mods to STATUS
backport.pl: preserve local mods to STATUS

Suggested by: julianfoad

* tools/dist/backport.pl
  (merge): Preserve local mods to STATUS, don't munge it in dry runs.
  (main): Disable check for local mods in interactive mode.


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

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