Client Preparation: Prepare Repository#merge for migration to Gitaly

~Conversation #551 (closed)

Edited by Andrew Newdigate