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 amin071/aminbmp-created-online-with-bitbucket-1391879482312 https://bitbucket.org/amin071/psiphon-circumvention-system-2
hg merge amin071/aminbmp-created-online-with-bitbucket-1391879482312
hg commit -m 'Merged in amin071/psiphon-circumvention-system-2/amin071/aminbmp-created-online-with-bitbucket-1391879482312 (pull request #4)'
AMIN.bmp created online with Bitbucket