Mercurial > hg-stable

changeset 13625:8aec2516602b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Steve Borho <steve@borho.org>
date Sun, 13 Mar 2011 10:09:30 -0500
parents 0e217d479c16 (current diff) 78cc35e75ecc (diff)
children 2ad66e6b2cc8
files hgext/eol.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/eol.py	Sun Mar 13 15:59:50 2011 +0100
+++ b/hgext/eol.py	Sun Mar 13 10:09:30 2011 -0500
@@ -243,8 +243,8 @@
 def extsetup(ui):
     try:
         extensions.find('win32text')
-        raise util.Abort(_("the eol extension is incompatible with the "
-                           "win32text extension"))
+        ui.warn(_("the eol extension is incompatible with the "
+                  "win32text extension\n"))
     except KeyError:
         pass