merge-tree: fix typo in merge-tree.c::unresolved