view tests/test-merge5.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 d45d1c90032e
children 7e4843b7efd2
line wrap: on
line source

+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ echo This is file b1
+ hg add a b
+ hg commit -t 'commit #0' -d '0 0' -u user
+ echo This is file b22
+ hg commit '-tcomment #1' -d '0 0' -u user
+ hg update 0
+ rm b
+ hg commit -A '-tcomment #2' -d '0 0' -u user
+ yes k
+ hg update 1
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use update -m to perform a branch merge)
+ exit 0