contrib/subtree: fix "subtree split" skipped-merge bug