Need help cloning? Visit
is a free Git and Mercurial client for Windows.
is a free Git and Mercurial client for Mac.
Bitbucket cannot automatically merge this request due to conflicts.
Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:
hg update default
hg pull -r default https://bitbucket.org/guibog/sphinx
hg merge bc38ebd64c2a
hg commit -m 'Merged in guibog/sphinx (pull request #82)'
Does this supersede pull request #27?
NB: There is an annoying dependency on Amazon's tool kindlegen, but if you think it could be worth it I am willing to try to use Calibre's convertor instead.