Rugged/Grit pull conversion

Update the related tests to check conflict files in more detail.
The error handling test also needed to be adjusted, and mocks raising
the appropriate exceptions instead of trying to craft a failing
situation.

Also extract the remote_branch lookup into a private method.