Puzzled by gitk patch representation for merge commits

[Jerome Lovy <t2a2e9z8ncbs9qg@xxxxxxxxxxxxx>]

Hello,

I don't understand the graphical scheme that gitk uses when displaying 
patches for merge commits. I would like to be able to explain this to 
the people I'm trying to evangelize to git, because they are also 
puzzled when they try to check with gitk what a merge has done to a 
given file.

I can see that at least three graphical hints seem to be involved:
- font: regular/bold
- color: red/blue
(maybe there are more colors when the commit has more than two parents?)
- column for displaying the '+' or '-'

But I just don't see what is the respective semantics of these hints...

(I'm using git 1.5.5.1 if that matters.)

Thanks in advance,
Jérôme

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html