author | Pulkit Goyal <7895pulkit@gmail.com> |
Wed, 14 Feb 2018 16:38:15 +0530 | |
changeset 36184 | 56635c506608 |
parent 36183 | 44a519ec5077 |
child 36185 | acc8e6e52af6 |
--- 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)