diff tests/test-merge6.out @ 4205:a7af0eeae8a3

Move branches.cache to branch.cache Keeps old clients from conflicting with new caches, makes features logic unnecessary.
author Matt Mackall <mpm@selenic.com>
date Tue, 13 Mar 2007 15:18:10 -0500
parents b2ae81a7df29
children 8feb33c2d153
line wrap: on
line diff