diff tests/test-conflict @ 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 e506c14382fd
children 46280c004f22
line wrap: on
line diff