Artifact b7d15ae3ad17eff81e44724445e792bddb5a199f:

• File src/merge.c — part of check-in [d327f12522] at 2010-03-15 18:09:35 on branch trunk — Add the --binary option to the "merge" command and a new "binary-glob" setting. These identify files that should be treated as binary files and which should not be subjected to a 3-way merge. (user: drh size: 10604) [more...]

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