tests/test-merge4.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Sat, 07 Apr 2007 04:27:55 -0300
changeset 4317 66249be9aa23
parent 2175 b2ae81a7df29
permissions -rw-r--r--
test-bad-pull: try to avoid timing-related failures

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)