Past changes from "Resolve" don't show up on subsequent "Resolve"s

[ggeorge]

Example:

1. Click Resolve on file A
2. Select hunks I want
3. Click Resolve on file A again
4. Changes from (2) not apparent, state reflects conflicts before (1)