Git version 2.17.1 Commit C0 contains FileA which is empty. Both branchA and branchB point to C0.
>From branchA I add the following contents to FileA (and then commit): --- One Two Three Seven Eight Nine --- >From branchB I add the following contents to FileA (and then commit): --- One Four Three Seven Ten Nine --- Note: I use two newlines so that git merge sees two hunks. Case1: >From branchA I merge branchB and resolve the conflict as follows: --- One Two Four Three Seven Eight Nine --- As expected, 'git show -c' outputs the combined diff for both hunks, whereas 'git show -cc' only shows hunk1 and omits "uninteresting" hunk2. Case2: First I amend branchA so that the second hunk is the same as in branchB (note that the first hunk is still different between the 2 branches): --- One Two Three Seven Ten Nine --- Then from branchA I merge branchB and resolve the conflict as follows (keeping only the changes from branchA): --- One Two Three Seven Ten Nine --- I was expecting `git show -c` to output the combined diff for "uninteresting" hunk1, just as it did for hunk2 in case1. But it doesn't. I realize that this is because fileA in the merge commit's tree is identical to what it was in branchA prior to the merge (so the output of 'git show -m' only outputs the diff for one parent). But I'm wondering if this is the intended behavior. If it's not, then the '-c' section in 'man git log' that says "it lists only files which were modified from all parents" may be a bit confusing since this requirement seems to be met. Thanks, Ralph
