view tests/test-merge4.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 4b0c9c674707
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)