diff tests/test-merge-default.out @ 4317:66249be9aa23

test-bad-pull: try to avoid timing-related failures
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sat, 07 Apr 2007 04:27:55 -0300
parents 013921c753bd
children 9cd6578750b9
line wrap: on
line diff