tests/test-merge4.out
author Matt Mackall <mpm@selenic.com>
Wed, 18 Oct 2006 10:46:51 -0500
changeset 3452 fcf14d87e0a4
parent 2175 b2ae81a7df29
permissions -rw-r--r--
If we can't write the branch cache, fail quietly.

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)