Artifact
efe026862abbb6ffc239095bde1f7ed613ae6b737f05213abd2f7e4c8fd90358:
- File
src/merge3.c
-
2024-12-05 19:22:17
— part of check-in
[48827897cf]
on branch better-merge
— Improvements to the merge UI. Fix a mostly-harmless assertion associated with
merge marks.
(user:
drh
size: 38418)
-
2024-12-05 20:12:02
— part of check-in
[1cf0d372fa]
on branch trunk
— 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.
(user:
drh
size: 38418)