So in short, one side has 1/2/3//7/10/9 in fileA and the other side has 1/4/3//7/10/9, and the result of the merge is recorded as 1/2/3//7/10/9. > 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. Yes, that is very much intended. We do not show hunks that match one of the parents, and if there is no hunk to show, the path itself is not shown.
