mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-30 09:01:24 +02:00
Code
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
40 Commits 6 Branches 954 Tags 460 MiB
C 50.3%
Shell 38.6%
Perl 5.2%
Tcl 3.3%
Python 0.8%
Other 1.6%
e2ed4324b0
Go to file
Paul Mackerras e2ed4324b0 First cut at displaying the diffs for a merge. 
We display the files where the child differs from the first parent
first in black in the file list window, followed by the second parent
in blue, and so on using different colors for each parent (provided
you don't have more than 6 parents; if you do we cycle around).
2005-07-17 03:39:44 -04:00
gitk First cut at displaying the diffs for a merge. 2005-07-17 03:39:44 -04:00