Mercurial > hg
diff hgext/eol.py @ 13625:8aec2516602b
merge with stable
author | Steve Borho <steve@borho.org> |
---|---|
date | Sun, 13 Mar 2011 10:09:30 -0500 |
parents | 9cb1a42cd4b3 78cc35e75ecc |
children | 328ce8a405ac |
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