equal
deleted
inserted
replaced
118 Hop we are done. |
118 Hop we are done. |
119 |
119 |
120 Verify line trimming of custom conflict marker using multi-byte characters |
120 Verify line trimming of custom conflict marker using multi-byte characters |
121 |
121 |
122 $ hg up -q --clean . |
122 $ hg up -q --clean . |
123 $ python <<EOF |
123 $ $PYTHON <<EOF |
124 > fp = open('logfile', 'w') |
124 > fp = open('logfile', 'w') |
125 > fp.write('12345678901234567890123456789012345678901234567890' + |
125 > fp.write('12345678901234567890123456789012345678901234567890' + |
126 > '1234567890') # there are 5 more columns for 80 columns |
126 > '1234567890') # there are 5 more columns for 80 columns |
127 > |
127 > |
128 > # 2 x 4 = 8 columns, but 3 x 4 = 12 bytes |
128 > # 2 x 4 = 8 columns, but 3 x 4 = 12 bytes |