view tests/test-diff-newlines @ 3727:0fb66912040a

merge: report destinations of moves in merge action messages
author Matt Mackall <mpm@selenic.com>
date Thu, 30 Nov 2006 17:36:33 -0600
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