Artifact e44e50371388d2a94f6a9ea112505e56a2b9a6cf:

• File src/file.c — part of check-in [9b7a6f80b2] at 2011-02-21 16:33:18 on branch trunk — Add the ability to use a graphical merging tool to resolve merge conflicts. Even without a configured graphical tool, leave files behind (VCS droppings) that contain the baseline, original, and merged files. (user: drh size: 16440)

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