view tests/test-diff-newlines @ 4819:9797124581c9

merge: fix adding untracked files on directory rename (issue612)

Fix from Brendan
Added test case

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