comparison tests/test-push-warn.out @ 4365: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 27230c29bfec
children
comparison
equal deleted inserted replaced
4364:d5c3a70f8422 4365:46280c004f22