Allow resolving conflicts for individual hunks instead of the whole file

[prati0100]

If there is a file with merge conflicts, git-gui shows options to resolve the conflicts as "ours" or "theirs". But, this resolution applies to the whole file, not individual hunks.

Allowing resolving conflicts per-hunk would be a nice quality-of-life enhancement.