equal
deleted
inserted
replaced
296 Content-Transfer-Encoding: 7bit |
296 Content-Transfer-Encoding: 7bit |
297 X-Test: foo |
297 X-Test: foo |
298 Date: * (glob) |
298 Date: * (glob) |
299 Subject: merge |
299 Subject: merge |
300 From: test@test.com |
300 From: test@test.com |
301 X-Hg-Notification: changeset 22c88b85aa27 |
301 X-Hg-Notification: changeset 6a0cf76b2701 |
302 Message-Id: <*> (glob) |
302 Message-Id: <*> (glob) |
303 To: baz@test.com, foo@bar |
303 To: baz@test.com, foo@bar |
304 |
304 |
305 changeset 22c88b85aa27 in b |
305 changeset 6a0cf76b2701 in b |
306 description: merge |
306 description: merge |
307 (run 'hg update' to get a working copy) |
307 (run 'hg update' to get a working copy) |
308 |
308 |
309 truncate multi-byte subject |
309 truncate multi-byte subject |
310 |
310 |
328 Content-Transfer-Encoding: 8bit |
328 Content-Transfer-Encoding: 8bit |
329 X-Test: foo |
329 X-Test: foo |
330 Date: * (glob) |
330 Date: * (glob) |
331 Subject: \xc3\xa0... (esc) |
331 Subject: \xc3\xa0... (esc) |
332 From: test@test.com |
332 From: test@test.com |
333 X-Hg-Notification: changeset 4a47f01c1356 |
333 X-Hg-Notification: changeset 7ea05ad269dc |
334 Message-Id: <*> (glob) |
334 Message-Id: <*> (glob) |
335 To: baz@test.com, foo@bar |
335 To: baz@test.com, foo@bar |
336 |
336 |
337 changeset 4a47f01c1356 in b |
337 changeset 7ea05ad269dc in b |
338 description: \xc3\xa0\xc3\xa1\xc3\xa2\xc3\xa3\xc3\xa4 (esc) |
338 description: \xc3\xa0\xc3\xa1\xc3\xa2\xc3\xa3\xc3\xa4 (esc) |
339 diffstat: |
339 diffstat: |
340 |
340 |
341 a | 1 + |
341 a | 1 + |
342 1 files changed, 1 insertions(+), 0 deletions(-) |
342 1 files changed, 1 insertions(+), 0 deletions(-) |
343 |
343 |
344 diffs (7 lines): |
344 diffs (7 lines): |
345 |
345 |
346 diff -r 22c88b85aa27 -r 4a47f01c1356 a |
346 diff -r 6a0cf76b2701 -r 7ea05ad269dc a |
347 --- a/a Thu Jan 01 00:00:03 1970 +0000 |
347 --- a/a Thu Jan 01 00:00:03 1970 +0000 |
348 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
348 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
349 @@ -1,2 +1,3 @@ |
349 @@ -1,2 +1,3 @@ |
350 a |
350 a |
351 a |
351 a |