diff tests/test-merge-prompt.t @ 20701:d20817ac628a

fix_bytesmod: use the "from mercurial" form of the import to avoid breaking httpclient Without this patch, 2to3's rewrites to httpclient cause it to fail to import. With this patch, it's probably hopelessly broken, but at least won't block forward progress on non-http2 functionality on Python 3.
author Augie Fackler <raf@durin42.com>
date Tue, 04 Feb 2014 18:33:25 -0500
parents c8ba98bf0e71
children 9ab18a912c44
line wrap: on
line diff