Mercurial > hg
diff contrib/simplemerge @ 36574:45f149bf08d1
templatekw: fix dict construction in _showlist to not mix bytes and strs
What we had was fine on Python 2, but was slightly wrong on Python
3. This works on both.
Differential Revision: https://phab.mercurial-scm.org/D2554
author | Augie Fackler <augie@google.com> |
---|---|
date | Fri, 02 Mar 2018 09:09:38 -0500 |
parents | d2fc88426d21 |
children | a8a902d7176e |