log tests/test-simplemerge.py.out @ 17769:8672e615d81c

age author description
Mon, 16 Apr 2007 20:17:39 -0300 Alexis S. L. Carvalho actually port simplemerge to hg