diff tests/test-merge10.out @ 9601:11ace5726d02

Dummy-merge with c655432c2c24 (issue1860)
author Mads Kiilerich <mads@kiilerich.com>
date Fri, 16 Oct 2009 11:18:38 +0200
parents 368a4ec603cc
children a3d73b3e1f8a
line wrap: on
line diff