Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-diff-newlines @ 5340:ad8783fe20f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
darcs2hg: Now detects and recovers from simple darcs conflicts.
author Terry Smith <terry@t11e.com>
date Tue, 11 Sep 2007 13:13:54 -0400
parents b914f0557832
children
line wrap: on
line source

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