diff hglib/merge.py @ 159:16496e0f3c09

util: update doctests to work with bytes (issue4520)
author Brett Cannon <brett@python.org>
date Fri, 27 Mar 2015 12:57:58 -0400
parents fe74d5599539
children
line wrap: on
line diff