tests/test-simplemerge-cmd.out

demandimport: patch __builtin__ instead of __builtins__

This helps on implementations other than CPython, where __builtins__ isn't
necessarily defined (as it's an implementation detail for CPython).

(binary:application/octet-stream)