User:Thejoppyloppy: Difference between revisions
From Test Wiki
Content deleted Content added
No edit summary |
→Old page history: changed inline styling to class, so i can easily style it with devtools |
||
| Line 3: | Line 3: | ||
==merge notes== |
==merge notes== |
||
===Old page history=== |
===Old page history=== |
||
<div style="width: |
<div style="width:100%; border:1px solid gray; border-width: 0 1px 2px 0; padding: 0 1em 1em 0;"> |
||
*<span |
*<span class="mergeold">Created [[/sandbox/mergeold]]</span> |
||
*<span class="mergeold">mold (old, original content. this content should be replaced.)</span> |
|||
*<span style="border:1px solid orange; float:right">+4 revisions to mergeold<span> |
|||
*<span class="mergeold">mold (old, original content. this content should be replaced. (removed 1 line))</span> |
|||
| ⚫ | |||
*<span class="mergeold">mold (old, original content. this content should be replaced. (removed 1 line again))</span> |
|||
*<span style="border:1px solid blue>+2 revisions to mergenew<br/> |
|||
*<span |
*<span class="mergeold">mold (old, original content. this content should be replaced. (added 3 lines))</span> |
||
| ⚫ | |||
*<span style="border:1px solid blue>+1 revision to mergenew (which is this description term/description) this edit will be considered "A" |
|||
*<span class="mergenew">mnew (new stuff. added revision)</span> |
|||
* <span style="border:1px solid blue>B, +1 revision to mergenew |
|||
* |
*<span class="mergenew">mnew (new stuff. added revision, again)</span> |
||
*<span class="mergeold">mold revisions to mergeold ("this is content created after mergenew "had 2 revision added to it after being created")</span> |
|||
* <span style="border:1px solid blue>D, +1 revision to mergenew |
|||
*<span class="mergeold">mold revisions to mergeold ("this is more content created after mergenew "had 2 revision added to it after being created")</span> |
|||
* <span style="border:1px solid blue>E, +1 revision to mergenew |
|||
*<span class="mergeold">mold revisions to mergeold ("even more content created after mergenew "had 2 revision added to it after being created")</span> |
|||
*<span class="mergenew">mnew A</span> |
|||
* <span class="mergenew">mnew B</span> |
|||
* <span class="mergeold">mold C</span> |
|||
* <span class="mergenew">mnew D</span> |
|||
* <span class="mergenew">mnew E</span> |
|||
</div> |
</div> |
||
5 revisions of User:Thejoppyloppy/sandbox/mergeold were merged into User:Thejoppyloppy/sandbox/mergenew. |
5 revisions of User:Thejoppyloppy/sandbox/mergeold were merged into User:Thejoppyloppy/sandbox/mergenew. |
||
| Line 23: | Line 29: | ||
**(prev) 16:11, 27 March 2025 . . Thejoppyloppy (talk | contribs | block) 243 bytes (old, original content. this content should be replaced.) |
**(prev) 16:11, 27 March 2025 . . Thejoppyloppy (talk | contribs | block) 243 bytes (old, original content. this content should be replaced.) |
||
**(prev) 16:08, 27 March 2025 . . Thejoppyloppy (talk | contribs | block) 61 bytes (recreating page that was previously deleted. page is mergeold) |
**(prev) 16:08, 27 March 2025 . . Thejoppyloppy (talk | contribs | block) 61 bytes (recreating page that was previously deleted. page is mergeold) |
||
*** aka: <span |
*** aka: <span class="mold">Created [[/sandbox/mergeold]], +4 revisions to mergeold.</span> |
||
===New page histories=== |
===New page histories=== |
||
