tests/test-simplemerge.py.out

match: make matchfn a method on the class

This makes it easier to override in subclasses, so they don't have to
assign the attribute with a lambda.

................
----------------------------------------------------------------------
Ran 16 tests in 0.000s

OK