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

Description

Git Source Code Mirror - This is a publish-only repository but pull requests can be turned into patches to the mailing list via GitGitGadget (https://gitgitgadget.github.io/). Please follow Documentation/SubmittingPatches procedure for any of your improvements.

chacktoberfestshell

829 MiB

Languages

C 50.1%

Shell 38.4%

Perl 5.1%

Tcl 3.2%

Python 0.8%

Other 2.1%