Mercurial > hg
view tests/test-conflict.out @ 8332:3e544c074459
patchbomb: quoted-printable encode overly long lines
RfC2822 mandates a line length limit of 998 byte + CRLF.
Python mail tools break lines at 990 byte. To prevent
that, we quoted-printable encode overly long lines.
| author | Rocco Rutte <pdmef@gmx.net> |
|---|---|
| date | Fri, 08 May 2009 18:30:44 +0200 |
| parents | 9fe7e6acf525 |
| children | b2310903c462 |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head merging a warning: conflicts during merge. merging a failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon e7fe8eb3e180+0d24b7662d3e+ tip <<<<<<< local something else ======= something >>>>>>> other M a ? a.orig