revision.c: Make --full-history consider more merges