Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-conflict.out @ 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 | c5df1a9c5276 |
| rev | line source |
|---|---|
| 346 | 1 + hg init |
| 2 + echo nothing | |
| 3 + hg add a | |
| 4 + hg commit -t ancestor -u test -d '0 0' | |
| 5 + echo something | |
| 6 + hg commit -t branch1 -u test -d '0 0' | |
| 7 + hg co 0 | |
| 8 + echo 'something else' | |
| 9 + hg commit -t branch2 -u test -d '0 0' | |
| 10 + export HGMERGE=merge | |
| 11 + HGMERGE=merge | |
| 591 | 12 + hg up -m 1 |
| 346 | 13 merge: warning: conflicts during merge |
| 14 merging a | |
| 15 merging a failed! | |
| 16 + hg id | |
|
374
f07d00fcd281
update tests to reflect new short hash length
mpm@selenic.com
parents:
346
diff
changeset
|
17 32e80765d7fe+75234512624c+ tip |
| 392 | 18 + grep -Ev '>>>|<<<' a |
| 346 | 19 something else |
| 20 ======= | |
| 21 something | |
| 22 + hg status | |
| 23 C a | |
| 24 ? .out |