# HG changeset patch # User Pulkit Goyal <7895pulkit@gmail.com> # Date 2018-02-14 11:08:15 # Node ID 56635c506608c162b1b2929e80502c398b4b3ee7 # Parent 44a519ec5077924153351b9ae28f4b3bc0a2989f py3: add couple of missing b'' in fakemergerecord.py # skip-blame as we are just adding b'' prefixes Differential Revision: https://phab.mercurial-scm.org/D2262 diff --git a/tests/fakemergerecord.py b/tests/fakemergerecord.py --- a/tests/fakemergerecord.py +++ b/tests/fakemergerecord.py @@ -19,8 +19,8 @@ def fakemergerecord(ui, repo, *pats, **o with repo.wlock(): ms = merge.mergestate.read(repo) records = ms._makerecords() - if opts.get('mandatory'): + if opts.get(b'mandatory'): records.append((b'X', b'mandatory record')) - if opts.get('advisory'): + if opts.get(b'advisory'): records.append((b'x', b'advisory record')) ms._writerecords(records)