[9fans] diff3 for c source

["Steve Simon" <steve@quintile.net>]

Anyone know of a tool that works like diff3 but has a fairly deep
knowledge of C cyntax, so it can merge changes at the C token level rather
than at the line level?

The problem I am trying to solve is keeping the (say) 9vx source in sync with
the plan9 kernel.

alternatively anyone known know of somthing which might be able to modify
the plan9 source to make it acceptable to gcc

	• adding names for unused function parameters
	• adding names for blind structure members
	• adding apropriate names for "auto structure member selection based on type"

the ed technique russ used is neat, and diff3 (v7 diff3 in my contrib) could do a
little better, but a real solution still eludes me.

-Steve