Mercurial > hg
comparison mercurial/merge.py @ 33682:1d5e497c08b3
py3: convert arbitrary exception object to byte string more reliably
Our exception types implement __bytes__(), which should be tried first. Do
lossy encoding conversion as a last resort.
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Thu, 03 Aug 2017 23:02:32 +0900 |
parents | 0407a51b9d8c |
children | 055fee3547df |
comparison
equal
deleted
inserted
replaced
33681:8626b44516c1 | 33682:1d5e497c08b3 |
---|