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 devip-revived https://bitbucket.org/yk/drawterm
hg merge devip-revived
hg commit -m 'Merged in yk/drawterm/devip-revived (pull request #2)'
devip: complete ipgen() (fixes issue #18)
devip: netstat-friendly Qstatus reads (fixes issue #18.2)