diff mercurial/merge.py @ 36541:c6a7b99f150a

error: fix isinstnace check to use bytes instead of str Differential Revision: https://phab.mercurial-scm.org/D2528
author Augie Fackler <augie@google.com>
date Thu, 01 Mar 2018 18:05:47 -0500
parents 1d99260c3a81
children 658b1d28813c
line wrap: on
line diff