log tests/test-conflict @ 4589:451e91ed535e

age author description
Sat, 28 Apr 2007 17:55:45 -0300 Alexis S. L. Carvalho run-tests.py: pass -L/--label to simplemerge