I just did a little more checking and a better way of writing this is probably:

```bash
git diff-tree -cc cc5b002a
```

You don't need the `-1` to limit it to a single commit and you don't need `-p` because `diff-tree` defaults to printing the patch of a commit and its parent(s).

You can still point out at the end of the article that these options work with `git log` and are useful for finding merge commits that contain conflict resolution changes.