tests/test-merge-default

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.

#!/bin/sh

hg init
echo a > a
hg commit -A -ma

echo a >> a
hg commit -mb

echo a >> a
hg commit -mc

hg up 1
echo a >> a
hg commit -md

hg up 1
echo a >> a
hg commit -me

hg up 1
echo % should fail because not at a head
hg merge

hg up
echo % should fail because \> 2 heads
hg merge

echo % should succeed
hg merge 2
hg commit -mm1

echo % should succeed - 2 heads
hg merge
hg commit -mm2

echo % should fail because at tip
hg merge

hg up 0
echo % should fail because 1 head
hg merge

true