Submitter | phabricator |
---|---|
Date | March 1, 2018, 9:35 a.m. |
Message ID | <6fe130affcdc8f392e8621864e21fbfc@localhost.localdomain> |
Download | mbox | patch |
Permalink | /patch/28533/ |
State | Not Applicable |
Headers | show |
Comments
Patch
diff --git a/tests/fakemergerecord.py b/tests/fakemergerecord.py --- a/tests/fakemergerecord.py +++ b/tests/fakemergerecord.py @@ -19,8 +19,8 @@ with repo.wlock(): ms = merge.mergestate.read(repo) records = ms._makerecords() - if opts.get(b'mandatory'): + if opts.get('mandatory'): records.append((b'X', b'mandatory record')) - if opts.get(b'advisory'): + if opts.get('advisory'): records.append((b'x', b'advisory record')) ms._writerecords(records)