Artifact 01985ecbf84fdf63d856f3b8ef215d7f4f1acd56:

• File src/merge.c — part of check-in [070ce24d83] at 2010-12-15 01:49:39 on branch trunk — Report the number of conflicts at the end of a merge or update and offer a hint to the user about the "fossil undo" command. (user: drh size: 14511)

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