Login
Timeline
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

1 check-in using file src/merge.c version ff6bbbc5f8

2023-04-19
03:23
Remove FSL_MERGE_FCHANGE_CONFLICT_ANCESTOR and its associated handling, as fossil no longer reports that as a problem. (Edit: closing this broken branch to re-start from a clean slate after some sleep.) Closed-Leaf check-in: c575ac0028 user: stephan tags: no-common-ancestor