On Monday 11 April 2005 08:51, Chris Mason wrote: > rej -M skips the merge program, so rej -a -M will give you something like > this: > > coffee:/local/linux.p # rej -a -M drivers/ide/ide.c.rej > drivers/ide/ide.c: 1 matched, 0 conflicts remain > > But I would want to go over the bit that calculates the conflicts remaining > more carefully if people plan on trusting this ;)
Ok, looks like this should be safe. I changed -q to skip the gui compare when rej thinks it has resolved all the conflicts correctly. With rej 0.14 (just uploaded now) this should do what you want: rej -q -a foo.rej Download site is here: ftp://ftp.suse.com/pub/people/mason/rej/ Please let me know if you find patches where rej is doing the wrong thing. -chris - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
