Fix display of conflicts in the main view when 'show-changes' is enabled

The main view showed both staged and unstaged changes, but should only
show unstaged changes for the unmerged file.