Report merge progress

As you resolve merge conflicts, advance a progress bar in the `MergeConflictsView`.