Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
11 check-ins using file src/merge.c version ab5ad1eff1
|
2024-12-06
| ||
| 01:42 | Merge from trunk ... (check-in: f826331554 user: brickviking tags: bv-infotool) | |
|
2024-12-05
| ||
| 23:36 | Fix a mis-closed blockquote, as reported in [forum:2b17e349f9|forum post 2b17e349f9]. ... (check-in: a69823c10b user: stephan tags: trunk) | |
| 23:15 | Fix memory leaks in merge. ... (check-in: 337617ba19 user: drh tags: trunk) | |
| 20:48 | Minor width adjustment for the merge-info GUI on Windows. ... (check-in: bf1af2e546 user: drh tags: trunk) | |
| 20:12 | When doing a merge, if a merge conflict occurs, a new section appears in the merge conflict markings that shows the suggested resolution. In addition, the "merge-info --tk" GUI is improved so that line numbers in the result column correspond with line numbers in the actual file. ... (check-in: 1cf0d372fa user: drh tags: trunk) | |
| 20:08 | Improvements to the file selection option-menu in the merge UI. ... (Closed-Leaf check-in: 4582d69e34 user: drh tags: better-merge) | |
| 19:22 | Improvements to the merge UI. Fix a mostly-harmless assertion associated with merge marks. ... (check-in: 48827897cf user: drh tags: better-merge) | |
| 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) | |