--- a/mercurial/exchange.py	Tue Aug 08 17:25:38 2017 -0700
+++ b/mercurial/exchange.py	Wed Aug 02 18:34:39 2017 +0200
@@ -681,7 +681,9 @@
                 if ctx.obsolete():
                     raise error.Abort(mso % ctx)
                 elif ctx.troubled():
-                    raise error.Abort(mst[ctx.troubles()[0]] % ctx)
+                    # TODO print more than one instability in the abort
+                    # message
+                    raise error.Abort(mst[ctx.instabilities()[0]] % ctx)
 
         discovery.checkheads(pushop)
     return True