Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
4 check-ins using file src/merge3.c version efe026862a
|
2024-12-05
| ||
| 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) | |