Paul Mackerras c8a4acbf4a Improve the merge display when the result differs from all parents. ...

Now we see if the result is quite similar to one of the parents, and
if it is, display the result as a diff from that parent.  If the result
is similar to more than one parent, pick the one that it's most
similar to.

2005-07-29 09:23:03 -05:00

gitk

Improve the merge display when the result differs from all parents.

2005-07-29 09:23:03 -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

532 MiB

Languages

C 50.5%

Shell 38.7%

Perl 4.5%

Tcl 3.2%

Python 0.8%

Other 2.1%