Update merge requests from fork project to origin project
There are merge conflicts
The comparison view may be inaccurate due to merge conflicts.
Resolve these conflicts or ask someone with write access to this repository to merge it locally.
Created by: zzet
Fix error described in https://github.com/gitlabhq/gitlabhq/issues/5185
The comparison view may be inaccurate due to merge conflicts.
Resolve these conflicts or ask someone with write access to this repository to merge it locally.