Mercurial > hg
view tests/test-issue619 @ 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 | 8808ea7da86b |
children | 4c94b6d0fb1c |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init echo a > a hg ci -Ama -d '1000000000 0' echo b > b hg branch b hg ci -Amb -d '1000000000 0' hg co -C 0 echo fast-forward hg merge b hg ci -Ammerge -d '1000000000 0' echo bogus fast-forward should fail hg merge b echo done