changeset 36222 | 56635c506608 |
parent 36211 | 8173eeb69fb3 |
child 36510 | 4dc6f0905722 |
--- a/tests/fakemergerecord.py Wed Feb 14 16:06:54 2018 +0530 +++ b/tests/fakemergerecord.py Wed Feb 14 16:38:15 2018 +0530 @@ -19,8 +19,8 @@ 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)