2020-02-25 23:03:06
— part of check-in
[6f08a5937b]
on branch mistake
— This merge occurred on a laptop and didn't get synced. Before the missing
sync was discovered, other check-ins occurred both on the branch and on
trunk. So it seems best to just abandon this merge.
(user:
drh
size: 17254)
2020-02-26 15:23:38
— part of check-in
[d20ead10c3]
on branch trunk
— Implement the --keep-merge-files option for the merge and update commands.
Merge-conflict files are omitted without this option. The merge conflict
files continue to exist for the stash command.
(user:
drh
size: 17254)
2020-04-15 11:12:00
— part of check-in
[7896afa71a]
on branch private-branches
— Merge in trunk.
(user:
florian
size: 17254)
2020-04-26 23:10:00
— part of check-in
[161a210687]
on branch wiki-history
— Merge in trunk
(user:
george
size: 17254)