rebasing-merge: look harder for previous rebasing merge