Mercurial > hg
diff mercurial/merge.py @ 21745:4c62478be2ea
minirst: explicitly decode substitutions
Caught by Augie and sys.setdefaultencoding("undefined")
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 13 Jun 2014 14:14:02 -0500 |
parents | bde505f47141 |
children | 46308fadaa15 b27c3beaaf30 |