Mercurial > hg
view tests/test-issue619.out @ 8817:6c9dce20ed70
Fixed patch.eol bug that truncated all patched lines to one character
Also updated the import-eol test to test with lines longer than one character,
and also empty lines.
author | Colin Caughie <c.caughie@indigovision.com> |
---|---|
date | Tue, 16 Jun 2009 16:22:42 +0100 |
parents | cdc458b12f0f |
children | 5b48d819d5f9 |
line wrap: on
line source
adding a marked working directory as branch b adding b 0 files updated, 0 files merged, 1 files removed, 0 files unresolved fast-forward 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) bogus fast-forward should fail abort: can't merge with ancestor done