Fix the print of the rebase error message, and make the output prettier too.

git_rebase_update.py

 #!/usr/bin/env python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 Tool to update all branches to have the latest changes from their upstreams.
 """
 
 import argparse
@@ skipping 119 matching lines @@
       empty_rebase = git.hash_one(squash_branch) == git.hash_one(parent)
       git.run('checkout', branch)
       git.run('branch', '-D', squash_branch)
       if squash_ret.success and empty_rebase:
         print 'Success!'
         git.squash_current_branch(merge_base=start_hash)
         git.rebase(parent, start_hash, branch)
       else:
         # rebase and leave in mid-rebase state.
         git.rebase(parent, start_hash, branch)
+        print "Failed!"
+        print
+        print "Here's what git-rebase had to say:"
         print squash_ret.message
         print
         print textwrap.dedent(
         """
         Squashing failed. You probably have a real merge conflict.
 
         Your working copy is in mid-rebase. Either:
          * completely resolve like a normal git-rebase; OR
          * abort the rebase and mark this branch as dormant:
                git config branch.%s.dormant true
@@ skipping 86 matching lines @@
           % (return_branch, root_branch)
         )
       git.run('checkout', root_branch)
     git.del_config(STARTING_BRANCH_KEY)
 
   return retcode
 
 
 if __name__ == '__main__':  # pragma: no cover
   sys.exit(main(sys.argv[1:]))