Skip to contentSkip to conversation

gitk: color in the merge diffs

DISCUSSION Santi Béjar 1 participant 1 message Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

Hello *,

In the diff of a merge it is used some colors for the parents, red for the first parent, blue for the second, then green, purple, brown, and the rest are grey. It would help to remember this code if the Parent's line in the comments used the same colors.

Parent: 2db8aaeca1dca4e940829b87d1164e5b42ff49b4 (rebase: ....)
Parent: b3f041fb0f7de167dbb6711b0a231d36c4b5de08 (git-am ...)
^^^^ in red the first and blue the second...

Thanks.