view tests/test-diff-newlines @ 2915:013921c753bd

merge with other head by default, not tip.
fixes issue 339.

#!/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