Fix a bug in error recovery logic in the 3-way merge.  Added new comments
to the 3-way merge code to hopefully make it easier to understand.