merging-rebase: fix a couple of obsolete comments