Artifact 748bc1e38f57b42a8521bc3ec0c077cef037b44c010aeb0346ac22f1574cb3cb:
- File
src/merge3.c
- 2021-03-10 12:34:45 — part of check-in [b491c196c2] on branch trunk — Ensure that there is always a newline before a conflict mark in merge output. See the [forum:/forumpost/2e97ca6caa|forum discussion]. (user: drh size: 19150)
- 2021-03-13 21:39:13 — part of check-in [1a403a7a0c] on branch wiki-history — Merge from trunk (user: george size: 19150)