mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-18 03:03:55 +01:00
Code
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
46 Commits 6 Branches 956 Tags 311 MiB
C 50.3%
Shell 38.6%
Perl 5.2%
Tcl 3.3%
Python 0.8%
Other 1.6%
9d2a52eca1
Go to file
Paul Mackerras 9d2a52eca1 Display the diffs for a merge in a unified fashion. 
Stuff that ended up in the result is shown in bold with a "+" at the
beginning of the line; stuff that didn't is in the normal font with
a "-" at the beginning of the line.  The color shows which parent
the stuff was in; red for the first parent, blue for the second, then
green, purple, brown, and the rest are grey.  If the result is different
from all of the parents it is shown in black (and bold).
2005-07-27 22:15:47 -05:00
gitk Display the diffs for a merge in a unified fashion. 2005-07-27 22:15:47 -05:00