diff tests/test-remove.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 b984dcb1df71
children 9770d260a405
line wrap: on
line diff