view tests/test-conflict.out @ 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 ee4c80d294e5
children eb46971fc57f
line wrap: on
line source

+ hg init
+ echo nothing
+ hg add a
+ hg commit -t ancestor -u test -d '0 0'
+ echo something
+ hg commit -t branch1 -u test -d '0 0'
+ hg co 0
+ echo 'something else'
+ hg commit -t branch2 -u test -d '0 0'
+ export HGMERGE=merge
+ HGMERGE=merge
+ hg -d up -m 1
merge: warning: conflicts during merge
resolving manifests
 ancestor 1c6e5a129854 local 35fedfab3325 remote a58017859bdc
 a versions differ, resolve
working dir created .out, keeping
merging a
resolving a
file a: other d7250518cb1b ancestor 68ba9db7a9e4
merging a failed!
+ hg id
32e80765d7fe+75234512624c+ tip
+ grep -Ev '>>>|<<<' a
something else
=======
something
+ hg status
C a
? .out