comparison tests/test-merge3.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 91c56c427171
children
comparison
equal deleted inserted replaced
2437:2f5dbc24874a 2438:a765f853439d