Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-conflict @ 586:11578820b5d7
[PATCH] Tags template cleanup
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] Tags template cleanup
From: Edouard Gomez <edouard.gomez@gmail.com>
Tags template cleanup
This page lists all tags, thus using divs doesn't structure well
the information. Better use a list (ul). Each tag becomes a li
element. The li element also carries the parity information.
As font style tags are highly deprecated in newer HTML variants
get rid of the tt element, relaced by a simple span that gets
a CSS class that mimics tt default style (monospaced text)
Added CSS classes required to match old style.
manifest hash: f8943b8270e20966a04111e7205deefedd8b7075
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCx1ijywK+sNU5EO8RAjaAAJoCVaD37YUC6DueL6Kd5D9aoCF8bQCfSWw0
xFVkpEtnr6ST4eyJjR8K17U=
=nphb
-----END PGP SIGNATURE-----
| author | mpm@selenic.com |
|---|---|
| date | Sat, 02 Jul 2005 19:16:51 -0800 |
| parents | 4fc63e22b1fe |
| children | eb46971fc57f |
| rev | line source |
|---|---|
|
544
3d4d5f2aba9a
Remove bashisms and use /bin/sh instead of /bin/bash.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
392
diff
changeset
|
1 #!/bin/sh |
| 346 | 2 |
| 3 set -x | |
| 4 hg init | |
| 5 echo "nothing" > a | |
| 6 hg add a | |
| 7 hg commit -t ancestor -u test -d "0 0" | |
| 8 echo "something" > a | |
| 9 hg commit -t branch1 -u test -d "0 0" | |
| 10 hg co 0 | |
| 11 echo "something else" > a | |
| 12 hg commit -t branch2 -u test -d "0 0" | |
| 13 export HGMERGE=merge | |
| 14 hg -d up -m 1 | |
| 15 hg id | |
| 392 | 16 grep -Ev ">>>|<<<" a |
| 346 | 17 hg status |