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.
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/skrebs/confluence-wiki-plugin
hg merge 5e6f75e1f88b
hg commit -m 'Merged in skrebs/confluence-wiki-plugin (pull request #1)'
Just a proof of concept change to use an xhtml macro rather than a wiki macro. By setting the output type to plain text, the body of the macro is not converted to storage format, the body can then be rendered with the old wiki renderer.