# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1305483341 18000
# Node ID abaacdab38f64e3f7f27d8bc6ec251c76dfcc30e
# Parent  d943412e2fba05f58bcbcaf1f12de2c466e687aa# Parent  3c65cdcf3ba6cdaa75e7b9e6eb8ef0ff0d3db197
merge with stable

diff -r d943412e2fba -r abaacdab38f6 mercurial/simplemerge.py
--- a/mercurial/simplemerge.py	Sun May 15 18:00:22 2011 +0100
+++ b/mercurial/simplemerge.py	Sun May 15 13:15:41 2011 -0500
@@ -407,10 +407,10 @@
         f.close()
         if util.binary(text):
             msg = _("%s looks like a binary file.") % filename
+            if not opts.get('quiet'):
+                ui.warn(_('warning: %s\n') % msg)
             if not opts.get('text'):
                 raise util.Abort(msg)
-            elif not opts.get('quiet'):
-                ui.warn(_('warning: %s\n') % msg)
         return text
 
     name_a = local
@@ -423,9 +423,12 @@
     if labels:
         raise util.Abort(_("can only specify two labels."))
 
-    localtext = readfile(local)
-    basetext = readfile(base)
-    othertext = readfile(other)
+    try:
+        localtext = readfile(local)
+        basetext = readfile(base)
+        othertext = readfile(other)
+    except util.Abort:
+        return 1
 
     local = os.path.realpath(local)
     if not opts.get('print'):