backport.pl: in conflicts batch mode, say nothing unless there is an error.
backport.pl: in conflicts batch mode, say nothing unless there is an error.

* tools/dist/backport.pl
  ($YES): Force the value to 0 or 1.
  (merge): Make some output conditional on the mode.  While here, fix tenses.
  (revert): Silence output in batch mode.  Rename tempfile for consistency

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

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