Added custom merge script, inducing fake merge conflicts for lst/mak

You may need to add the following to your git config:
[merge "verify"]
        name = merge and verify driver
        driver = ./mamemerge %A %O %B