tests/test-diff-newlines
author Sascha Wilde <wilde@sha-bang.de>
Wed, 15 Aug 2007 17:27:51 +0200
changeset 5171 f53d97d651f4
parent 2248 b914f0557832
permissions -rwxr-xr-x
Use smerge minor mode in emacs to resolve conflicts. The condition-case is used to suppress errors with emacs versions before 21.

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