comparison mercurial/simplemerge.py @ 17203:0cb55b5c19a3

util, posix: eliminate encodinglower and encodingupper 2ebe3d0ce91d claims this was needed "to avoid cyclic dependency", but there is no cyclic dependency. windows.py already imports encoding, posix.py can import it too, so we can simply use encoding.upper in windows.py and in posix.py. (this is a partial backout of 2ebe3d0ce91d)
author Adrian Buehlmann <adrian@cadifra.com>
date Wed, 18 Jul 2012 14:41:58 +0200
parents e34106fa0dc3
children 4aeb7a6029ba
comparison
equal deleted inserted replaced
17202:1ae119269ddc 17203:0cb55b5c19a3