Artifact
6d1a4bca4e219e85b3ba36504217f591c3bfec5ac2c075adc2a595cee1238cf0:
- File
src/merge3.c
-
2020-08-25 00:01:25
— part of check-in
[88ff2642d3]
on branch trunk
— Improvements to handling of line endings and BOM marks when doing a
3-way merge.
(user:
drh
size: 19112)
-
2020-08-25 00:01:25
— part of check-in
[88ff2642d3]
on branch trunk
— Improvements to handling of line endings and BOM marks when doing a
3-way merge.
(user:
drh
size: 19112)
-
2020-08-26 16:11:15
— part of check-in
[b56460fc96]
on branch wiki-history
— Merge in trunk (check-in [9543ddbef2])
(user:
george
size: 19112)