##// END OF EJS Templates
py3: add couple of missing b'' in fakemergerecord.py...
Pulkit Goyal -
r36202:56635c50 default
parent child Browse files
Show More
@@ -19,8 +19,8 b' def fakemergerecord(ui, repo, *pats, **o'
19 with repo.wlock():
19 with repo.wlock():
20 ms = merge.mergestate.read(repo)
20 ms = merge.mergestate.read(repo)
21 records = ms._makerecords()
21 records = ms._makerecords()
22 if opts.get('mandatory'):
22 if opts.get(b'mandatory'):
23 records.append((b'X', b'mandatory record'))
23 records.append((b'X', b'mandatory record'))
24 if opts.get('advisory'):
24 if opts.get(b'advisory'):
25 records.append((b'x', b'advisory record'))
25 records.append((b'x', b'advisory record'))
26 ms._writerecords(records)
26 ms._writerecords(records)
General Comments 0
You need to be logged in to leave comments. Login now