Whitespace changes
Reinclude tm_tag.h in tm_workspace.c

To make Colomban happy.
Various cleanups in the merge algorithm

Remove the continue statement and use if/else instead. Initialize the
val1 variable only with the value used for the chosen path (normal/fast).
Remove unused return value
Move the refcount TMTag member up in the structure and don't document it for plugins