log tests/test-simplemerge.py @ 14175:b452abffcb15

age author description
Tue, 09 Feb 2010 14:12:22 -0600 Matt Mackall fix up a bunch of check-code warnings