Updated to the 'ssl' branch of the Fossil code.  After a while, did a 'merge --cherrypick' to get particular change.

Then decided to abandon the changes, so did 'revert'.  Fossil updated the changed files.

Now, when doing "update", Fossil says: <tt>fossil: cannot update an uncommitted merge</tt>