Mercurial > hg
diff mercurial/merge.py @ 30076:400dfded8a29
py3: make the string unicode so its iterable in py3k
author | Mateusz Kwapich <mitrandir@fb.com> |
---|---|
date | Sat, 08 Oct 2016 08:45:28 -0700 |
parents | a145161debed |
children | 98d3d8108db0 |
author | Mateusz Kwapich <mitrandir@fb.com> |
---|---|
date | Sat, 08 Oct 2016 08:45:28 -0700 |
parents | a145161debed |
children | 98d3d8108db0 |