Fix some annoyances with "merge".  This involves a schema change
to the _FOSSIL_ file.  Older versions will continue to work, but
it would make since to "close" and "open" local source tree after
updating to this version of fossil, in order to update the schema.