view tests/test-conflict @ 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.

#!/bin/sh

hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "1000000 0"
echo "something" > a
hg commit -m branch1 -d "1000000 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "1000000 0"
hg merge 1
hg id
cat a
hg status