Skip to content
Snippets Groups Projects
Commit 8aec2516602b authored by Steve Borho's avatar Steve Borho
Browse files

merge with stable

No related branches found
No related tags found
No related merge requests found
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment