tests/test-diff-newlines
author Matt Mackall <mpm@selenic.com>
Mon, 07 Aug 2006 23:53:04 -0500
changeset 2824 ca06d35af65e
parent 2248 b914f0557832
permissions -rwxr-xr-x
Rename merge.allow -> merge.branchmerge

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