Merge before-ghci -> before-ghci-branch-merged in the non-ghc parts of
the tree.