Update cannot merge message

* https://github.com/openshift/origin-server/issues/669
Merge pull request #10 from jwhonce/issue/669

Update cannot merge message