Ralph Maalouf <[email protected]> writes: > "We do not show hunks that match one of the parents ". But in case > 1 the second hunk matches one of the parents yet `git show -c` > still outputs it. > > diff --combined test1 > index 02ef2b0,ffc05f2..59d575d > --- a/test1 > +++ b/test1 > @@@ -1,8 -1,8 +1,9 @@@ > One > +Two > + Four > Three > > > Seven > -Ten > +Eight > Nine
The above is a single hunk (whose definition is the group of lines delimited by @@@...@@@ lines).
