Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
authorSteve Borho <steve@borho.org>
Sun, 13 Mar 2011 10:09:30 -0500
changeset 13625 8aec2516602b
parent 13623 0e217d479c16 (current diff)
parent 13624 78cc35e75ecc (diff)
child 13628 2ad66e6b2cc8
merge with stable
hgext/eol.py file | annotate | diff | comparison | revisions 
--- 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
Mercurial