David Lang [off-list ref] writes:
On Wed, 18 Apr 2007, Linus Torvalds wrote:
I could also see having one external program that can handle the
different types of files and/or merges. rather than having a different
line for each would it make sense to add another variable that could
be handed to the merge program that would tell it what sort of merge
to do?
That was the direction I was thinking about.