Need help cloning? Learn how to
clone a repository.
is a free Git and Mercurial client for Windows.
is a free Git and Mercurial client for Mac.
Bitbucket cannot automatically merge this request.
The commits that make up this pull request have been removed.
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/Koblaid/lore2sphinx
hg merge e84e30f85232
hg commit -m 'Merged in Koblaid/lore2sphinx (pull request #1)'
This fixes ticket #11 for me and is a lot simpler than my last patch.