Jonathan Nieder <jrnieder@xxxxxxxxxxxx> writes:
> + This flag implies the '-c' option and makes the patch output
> + even more compact by omitting uninteresting hunks. A hunk is
> + considered uninteresting if the person merging had two versions
> + to choose between among all of the parents and the result shows
Hmm, I am not a native speaker, but the above makes me confused into
thinking that even if there are 47 parent versions, it is Ok if I looked
at only two versions and picked from one of them -- the description does
not seem to make it clear that it is required that the other 45 agree with
one of the two I looked at and picked from.
... if the contents in the parents had only two variants and the merge
result picked one of them without modification.
would be succinct enough, perhaps?
If we want to further elaborate, we could say something like:
In a two-parent merge, by definition, there can only be two variants
to choose from. Even in a merge with more than two parents, if some
parents share the same content, and all the other parents share
another, same content, there are only two variants to choose from.
but I think that is too verbose...
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
