# HG changeset patch
# User Steve Borho <steve@borho.org>
# Date 2011-03-13 15:09:30
# Node ID 8aec2516602bf81da69a775a2b2853aca9aecad5
# Parent  0e217d479c16a6ef6e61481c92db137080c8ddd6
# Parent  78cc35e75eccf5113827da06b0dd89b7216f04c8

merge with stable

diff --git a/hgext/eol.py b/hgext/eol.py
--- a/hgext/eol.py
+++ b/hgext/eol.py
@@ -243,8 +243,8 @@ def uisetup(ui):
 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