diff tests/test-merge7.t @ 36177:187f2474bc11

merge: coerce nodes to bytes, not str Differential Revision: https://phab.mercurial-scm.org/D2250
author Augie Fackler <augie@google.com>
date Tue, 13 Feb 2018 23:37:58 -0500
parents 41ef02ba329b
children 009d0283de5f
line wrap: on
line diff