view tests/test-diff-newlines @ 5672:8a65ea986755

Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)

#!/bin/sh

hg init
python -c 'print "confuse str.splitlines\nembedded\rnewline"' > a
hg ci -Ama -d '1 0'
echo clean diff >> a
hg ci -mb -d '2 0'
hg diff -r0 -r1