Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-conflict @ 672:dbe0ce2ae196
More IE friendly diff output related templates.
# HG changeset patch
# User Edouard Gomez <ed.gomez@free.fr>
# Node ID 6eee9b54c53c41643192c7920db642c984a00a21
# Parent 8b8f710bb65875d588044c3615cf42180aee23ff
More IE friendly diff output related templates.
I thought i could use CSS to render properly the diff blocks in IE.
But i was obviously too optmistic and didn't realized that IE only
renders preformated text for pre tag content...
So i had to rollback some of my changes to accomodate to this IE
bug/limitation. A diff blocks become pre tags, and diff lines
become span again. Hopefully, the pages continue validating.
author | Edouard Gomez <ed.gomez@free.fr> |
---|---|
date | Sun, 10 Jul 2005 16:14:28 -0800 |
parents | eb46971fc57f |
children | 7e4843b7efd2 |
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 | |
591 | 14 hg up -m 1 |
346 | 15 hg id |
392 | 16 grep -Ev ">>>|<<<" a |
346 | 17 hg status |