diff tests/test-log.out @ 4361:46280c004f22

change tests to use simplemerge by default
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 16 Apr 2007 20:17:39 -0300
parents f80cf8b7bbd9
children e0bc2c575044
line wrap: on
line diff