Resolve Conflicts: better default resolution view

Also show "Gstatus" afterwards, so there's indication that something was
resolved and we are invited to make a commit or jump to the next file.