Improve error message for diverged deps
Merge pull request #1217 from ericmj/mix-outofdatedepserror

Improve error message for diverged deps