Artifact 0d0cf4b86fd4f51cf4731313833b215997360314:

• File src/merge.c — part of check-in [0df5249d51] at 2016-12-24 00:30:41 on branch trunk — When a file has been deleted on the current branch and edited on a separate branch, bring in the edited version of the file when merging from the separate branch. (user: drh size: 29111) [more...]

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