Fossil SCM
First in a potential series of many changes to doc markup in this repo (especially to www/*) to work better with the Inskinerator project's Modern override. This one changes an explicit HTML table in www/rebaseharm.md to a Markdown table so our CSS can take full effect.
Commit
facb988055fe014dcde591432248f750f3e5966d930ff8b35f6b3c2f32bda5f4
Parent
09cd585f80c6c13…
1 file changed
+4
-5
+4
-5
| --- www/rebaseharm.md | ||
| +++ www/rebaseharm.md | ||
| @@ -198,15 +198,14 @@ | ||
| 198 | 198 | |
| 199 | 199 | But that argument is comparing apples to oranges, since the two diffs |
| 200 | 200 | do not have the same baseline. The correct way to see only the feature |
| 201 | 201 | branch changes in the merge case is not diff(C2,C7) but rather diff(C6,C7). |
| 202 | 202 | |
| 203 | -<center><table border="1" cellpadding="5" cellspacing="0"> | |
| 204 | -<tr><th>Rebase<th>Merge<th>What You See | |
| 205 | -<tr><td>diff(C2,C5\')<td>diff(C2,C7)<td>Commingled branch and mainline changes | |
| 206 | -<tr><td>diff(C6,C5\')<td>diff(C6,C7)<td>Branch changes only | |
| 207 | -</table></center> | |
| 203 | +| Rebase | Merge | What You See | |
| 204 | +|---------------|-------------|------------- | |
| 205 | +| diff(C2,C5\') | diff(C2,C7) | Commingled branch and mainline changes | |
| 206 | +| diff(C6,C5\') | diff(C6,C7) | Branch changes only | |
| 208 | 207 | |
| 209 | 208 | Remember: C7 and C5\' are bit-for-bit identical, so the output of the |
| 210 | 209 | diff is not determined by whether you select C7 or C5\' as the target |
| 211 | 210 | of the diff, but rather by your choice of the diff source, C2 or C6. |
| 212 | 211 | |
| 213 | 212 |
| --- www/rebaseharm.md | |
| +++ www/rebaseharm.md | |
| @@ -198,15 +198,14 @@ | |
| 198 | |
| 199 | But that argument is comparing apples to oranges, since the two diffs |
| 200 | do not have the same baseline. The correct way to see only the feature |
| 201 | branch changes in the merge case is not diff(C2,C7) but rather diff(C6,C7). |
| 202 | |
| 203 | <center><table border="1" cellpadding="5" cellspacing="0"> |
| 204 | <tr><th>Rebase<th>Merge<th>What You See |
| 205 | <tr><td>diff(C2,C5\')<td>diff(C2,C7)<td>Commingled branch and mainline changes |
| 206 | <tr><td>diff(C6,C5\')<td>diff(C6,C7)<td>Branch changes only |
| 207 | </table></center> |
| 208 | |
| 209 | Remember: C7 and C5\' are bit-for-bit identical, so the output of the |
| 210 | diff is not determined by whether you select C7 or C5\' as the target |
| 211 | of the diff, but rather by your choice of the diff source, C2 or C6. |
| 212 | |
| 213 |
| --- www/rebaseharm.md | |
| +++ www/rebaseharm.md | |
| @@ -198,15 +198,14 @@ | |
| 198 | |
| 199 | But that argument is comparing apples to oranges, since the two diffs |
| 200 | do not have the same baseline. The correct way to see only the feature |
| 201 | branch changes in the merge case is not diff(C2,C7) but rather diff(C6,C7). |
| 202 | |
| 203 | | Rebase | Merge | What You See |
| 204 | |---------------|-------------|------------- |
| 205 | | diff(C2,C5\') | diff(C2,C7) | Commingled branch and mainline changes |
| 206 | | diff(C6,C5\') | diff(C6,C7) | Branch changes only |
| 207 | |
| 208 | Remember: C7 and C5\' are bit-for-bit identical, so the output of the |
| 209 | diff is not determined by whether you select C7 or C5\' as the target |
| 210 | of the diff, but rather by your choice of the diff source, C2 or C6. |
| 211 | |
| 212 |