* wp/merge-tree-fix: merge-tree: fix where two branches share no changes add basic tests for merge-tree