Fossil

Timeline
Login

Timeline

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

8 check-ins using file src/merge3.c version e2b8e0bdff

2024-12-04
18:49
Improved controls at the top of the --tk merge information GUI. ... (check-in: f8932be5aa user: drh tags: trunk)
17:00
Wrap the list of attachments displayed on technotes/events, tickets and wiki pages in their own 'section' HTML element with CSS class name 'attachlist'. Inspired by [forum:8da5a5d868 | forum thread 8da5a5d868]. ... (check-in: 4f9ecd0392 user: stephan tags: trunk)
15:59
Fix a mis-quoted DOM element attribute, as reported in [forum:5bdbb8b949|forum post 5bdbb8b949]. ... (check-in: f96a3ba792 user: stephan tags: trunk)
13:42
Fix uninitialized variable in the "fossil merge-info --tk" command. ... (check-in: 3165e1bfb3 user: drh tags: trunk)
13:40
Add the "fossil merge-info" command for improved situational awareness on complex merge operations. ... (check-in: aa829657f0 user: drh tags: trunk)
13:38
By default, the merge-info command only shows "interesting" change - actual merges, errors, and conflicts. Use the --all option to see everything. ... (Closed-Leaf check-in: b764f2d007 user: drh tags: merge-enhancements)
2024-12-03
20:37
The "fossil merge-info --tk" command appears to be working. Probably there are still undiscovered bugs. ... (check-in: a199d970a5 user: drh tags: merge-enhancements)
19:20
The "fossil merge-info --tcl FILE" command generates content for the merge.tcl GUI using MERGESTAT data. Incremental check-in. ... (check-in: cbd24a2594 user: drh tags: merge-enhancements)