Fossil SCM
Update the change log.
Commit
e850ce1cb2a47f46fade3674a6d4f1537d3036bdef1fc1f82b8283ebf202c579
Parent
726709d92ac74af…
1 file changed
+11
-1
+11
-1
| --- www/changes.wiki | ||
| +++ www/changes.wiki | ||
| @@ -1,10 +1,20 @@ | ||
| 1 | 1 | <title>Change Log</title> |
| 2 | 2 | |
| 3 | 3 | <h2 id='v2_26'>Changes for version 2.26 (pending)</h2> |
| 4 | 4 | |
| 5 | - * <i>(pending)</i> | |
| 5 | + * Added the [/help?cmd=/ckout|/ckout web page] to provide information | |
| 6 | + about pending changes in a working check-out | |
| 7 | + * The [/help?cmd=ui|fossil ui] command defaults to using the /ckout | |
| 8 | + page as its start page. | |
| 9 | + * Added the [/help?cmd=merge-info|fossil merge-info] command and especially | |
| 10 | + the --tk option to that command, to provide analysis of the most recent | |
| 11 | + merge or update operation. | |
| 12 | + * Issue a warning if a user tries to commit on a check-in where the | |
| 13 | + branch has been changed. | |
| 14 | + * When a merge conflict occurs, a new section is added to the conflict | |
| 15 | + text that shows Fossil's suggested resolution to the conflict. | |
| 6 | 16 | |
| 7 | 17 | <h2 id='v2_25'>Changes for version 2.25 (2024-11-06)</h2> |
| 8 | 18 | |
| 9 | 19 | * The "[/help?cmd=ui|fossil ui /]" command now works even for repositories |
| 10 | 20 | that have non-ASCII filenames |
| 11 | 21 |
| --- www/changes.wiki | |
| +++ www/changes.wiki | |
| @@ -1,10 +1,20 @@ | |
| 1 | <title>Change Log</title> |
| 2 | |
| 3 | <h2 id='v2_26'>Changes for version 2.26 (pending)</h2> |
| 4 | |
| 5 | * <i>(pending)</i> |
| 6 | |
| 7 | <h2 id='v2_25'>Changes for version 2.25 (2024-11-06)</h2> |
| 8 | |
| 9 | * The "[/help?cmd=ui|fossil ui /]" command now works even for repositories |
| 10 | that have non-ASCII filenames |
| 11 |
| --- www/changes.wiki | |
| +++ www/changes.wiki | |
| @@ -1,10 +1,20 @@ | |
| 1 | <title>Change Log</title> |
| 2 | |
| 3 | <h2 id='v2_26'>Changes for version 2.26 (pending)</h2> |
| 4 | |
| 5 | * Added the [/help?cmd=/ckout|/ckout web page] to provide information |
| 6 | about pending changes in a working check-out |
| 7 | * The [/help?cmd=ui|fossil ui] command defaults to using the /ckout |
| 8 | page as its start page. |
| 9 | * Added the [/help?cmd=merge-info|fossil merge-info] command and especially |
| 10 | the --tk option to that command, to provide analysis of the most recent |
| 11 | merge or update operation. |
| 12 | * Issue a warning if a user tries to commit on a check-in where the |
| 13 | branch has been changed. |
| 14 | * When a merge conflict occurs, a new section is added to the conflict |
| 15 | text that shows Fossil's suggested resolution to the conflict. |
| 16 | |
| 17 | <h2 id='v2_25'>Changes for version 2.25 (2024-11-06)</h2> |
| 18 | |
| 19 | * The "[/help?cmd=ui|fossil ui /]" command now works even for repositories |
| 20 | that have non-ASCII filenames |
| 21 |