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 m68kasm https://bitbucket.org/lgiordani/pygments-main
hg merge m68kasm
hg commit -m 'Merged in lgiordani/pygments-main/m68kasm (pull request #765)'
This code adds the Motorola 68k family Assembly language as used for example in the Amiga code and include files. It’s my first PR on this project, with BitBucket, and with Mercurial, so I beg pardon if something is not correct, just let me know.