On 01/10/14 17:05, Andrew Gregory wrote: > Puts all of the conflict cases at the same level. > > Signed-off-by: Andrew Gregory <andrew.gregory.8 at gmail.com> > --- > > This is almost entirely whitespace reduction; the actual changes are much more > visible with --ignore-space-change. > Thanks for the hint! Ack.