Re: [PATCH] bring description of git diff --cc up to date

Jonathan Nieder [off-list ref] writes:

Just to make sure I understand, here is what I think --cc does:

  - In a two-parent merge, it is exactly as Linus has been
    ...
  - In a many-parent merge, the criterion is more stringent.
    ...

Is that correct?

The logic in the code does not have separate criteria for two-parent and
Octopus cases.  Actually Linus talks about "when you have two versions to
choose from, and if the result matches one of them, then it is not
interesting".  In a two-parent merge, you cannot have three or more
possible versions to choose from by definition, can you?