tests/test-merge2.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Thu, 15 Jun 2006 15:42:16 -0700
changeset 2438 a765f853439d
parent 2175 b2ae81a7df29
permissions -rw-r--r--
test-bad-pull: fix change in error output.

0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b