Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-conflict.t
changeset 35947 a36d3c8a0e41
parent 35704 41ef02ba329b
child 35949 80e5210df25c 
--- a/tests/test-conflict.t	Wed Feb 07 13:21:06 2018 +0530
+++ b/tests/test-conflict.t	Wed Feb 07 13:34:51 2018 +0530
@@ -139,8 +139,8 @@
   $ hg up -q --clean .
   $ $PYTHON <<EOF
   > fp = open('logfile', 'w')
-  > fp.write('12345678901234567890123456789012345678901234567890' +
-  >          '1234567890') # there are 5 more columns for 80 columns
+  > fp.write(b'12345678901234567890123456789012345678901234567890' +
+  >          b'1234567890') # there are 5 more columns for 80 columns
   > 
   > # 2 x 4 = 8 columns, but 3 x 4 = 12 bytes
   > fp.write(u'\u3042\u3044\u3046\u3048'.encode('utf-8'))
Mercurial