Pull requests

#4 Open
psiphon/Psiphon Circumvention System Psiphon Circumvention System

AMIN.bmp created online with Bitbucket

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)'
  1. amin 071 avataramin 071

AMIN.bmp created online with Bitbucket

Comments (0)

Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.