Feature request - optionally include merge conflicts in `git add -p`

Hey all,

A small feature request (and hopefully not a small "tell me I misread the docs"!) -

When fixing up conflicts from a rebase / cherry-pick / etc, files with conflicts are excluded from `git add`. This is very sensible in almost all cases.

However, would it make sense to make a special case for `git add -p` / `git add --patch` / patch mode of `git add --interactive`? There seems no reason to exclude potentially unmerged files in mode, which goes through changes chunk by chunk.

Excluding these files means I need to manually go copy paste the filename into `git add` (the horror), and additionally I don't get the great chunk-by-chunk feedback from patch mode above.

Cheers! Jarrad