Fossil

Timeline
Login

Timeline

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

4 check-ins using file src/merge3.c version 71e9bedbc7

2024-12-05
18:56
Fix horizontal scrolling in the merge UI. ... (check-in: 06df966b19 user: drh tags: better-merge)
18:45
Merge UI menu buttons working on Darwin. ... (check-in: 76b39a2c9f user: drh tags: better-merge)
18:00
Improvements to how resizing works in the merge --tk UI. ... (check-in: e9d1d71669 user: drh tags: better-merge)
17:13
In the merge engine, make sure V1 is always used for the local copy and V2 is used for the merge-in. ... (check-in: 873b364b92 user: drh tags: better-merge)