As far as I know, merge is the only tool in the bag. There’s a related GitHub issue, closed due to lack of activity:
merge