Mercurial > hg-stable
changeset 14329:abaacdab38f6
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sun, 15 May 2011 13:15:41 -0500 |
| parents | d943412e2fba (current diff) 3c65cdcf3ba6 (diff) |
| children | 473d0aaf7655 |
| files | mercurial/simplemerge.py |
| diffstat | 1 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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'):