Mercurial > hg
diff tests/test-merge5.out @ 6381:0b89315d5de2
Fix missing space in one of the new update messages.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Mon, 24 Mar 2008 20:28:13 +0100 |
| parents | cdc458b12f0f |
| children | 68a1b9d0663e |
line wrap: on
line diff
--- a/tests/test-merge5.out Mon Mar 24 16:17:19 2008 -0300 +++ b/tests/test-merge5.out Mon Mar 24 20:28:13 2008 +0100 @@ -4,4 +4,4 @@ % should abort abort: crosses branches (use 'hg merge' or 'hg update -C' to discard changes) % should succeed -abort: crosses branches (use 'hg merge'or 'hg update -C') +abort: crosses branches (use 'hg merge' or 'hg update -C')