diff tests/test-merge6.out @ 2438:a765f853439d

test-bad-pull: fix change in error output.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Thu, 15 Jun 2006 15:42:16 -0700
parents b2ae81a7df29
children 8feb33c2d153
line wrap: on
line diff