view tests/test-issue619 @ 5820:3a1ffc1da32c

Fixed numerous XHTML problems that caused validation errors and warnings. Link elements for Atom and RSS feeds had no end tag. <div> block element inside <a> in-line element isn't right and caused rendering problems on Safari. Spurious </div> tag in search forms. Branch entry missing closing </a> tag.
author Kevin Christen <kevin.christen@gmail.com>
date Mon, 07 Jan 2008 21:29:40 -0600
parents 8808ea7da86b
children 4c94b6d0fb1c
line wrap: on
line source

#!/bin/sh

mkdir t
cd t
hg init
echo a > a
hg ci -Ama -d '1000000000 0'
echo b > b
hg branch b
hg ci -Amb -d '1000000000 0'
hg co -C 0

echo fast-forward
hg merge b
hg ci -Ammerge -d '1000000000 0'

echo bogus fast-forward should fail
hg merge b

echo done