rebase --merge: return control to caller, for housekeeping