Artifact ff6bbbc5f8ccc95bbd866a9e3d83dd4bde27d4b2:

• File src/merge.c — part of check-in [c575ac0028] at 2023-04-19 03:23:05 on branch no-common-ancestor — 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.) (user: stephan size: 42980)

A hex dump of this file is not available. Please download the raw binary file and generate a hex dump yourself.