Home | History | Annotate | Download | only in Scripts

Lines Matching full:merge

43 #   Help merge when there are ChangeLog conflicts or if there's
338         print STDERR "  Attempting to merge conflicted ChangeLogs.\n";