Durham Goode ce9d5a2f0f py3: fix conflict resolution case handling ... Summary: In python 3 these strings are already unicode, so let's just .upper() them. Otherwise it crashes with 'no decode() on str'. This only impacts eden checkouts, since non-eden uses treestate which doesn't use this codepath. Reviewed By: quark-zju Differential Revision: D27978369 fbshipit-source-id: a298c1b455fdb8aa09db0ac667bd97b8e419bbe8		2021-04-23 18:04:11 -07:00
..
hgdemandimport	Back out "log: backout D24293498 about prefetching commit data"	2020-11-06 16:25:00 -08:00
hgext	commitcloud: don't crash pull if there are no commitcloud certs	2021-04-23 17:01:21 -07:00
mercurial	py3: fix conflict resolution case handling	2021-04-23 18:04:11 -07:00
__init__.py	apply pyfmt with usort to opted-in sources	2020-11-10 21:25:54 -08:00
__main__.py	edenscm: add a main module	2020-01-30 18:09:14 -08:00
hooks.py	py3: fix conflictinfo compatibility	2020-09-01 18:31:35 -07:00
traceimport.py	debugshell: improve "%trace" UX	2020-09-01 13:49:13 -07:00
tracing.py	tracing: add isenabled	2021-04-21 09:25:49 -07:00