merge: give a bit prettier merge message to "merge branch~$n"