mercurial.utils does not always contain deque
(e.g. it doesn't in mercurial-2.2.3-1.fc17.x86_64 rpm)
Respecting recent commit that uses mercurial.utils for python 2.4
we try default collections deque and fallback to mercurial.utils
Oops, I misunderstood. I think the conflict markers just mean that this fix has already been applied, independently of your pull request. So this pull request is no longer needed; you might as well close it.