diff tests/test-merge5 @ 3854:4f6db0233606

Merge Benoit's .hg/store support
author Matt Mackall <mpm@selenic.com>
date Sun, 10 Dec 2006 02:11:02 -0600
parents fffc8a733bf9
children 6aa4a3fa4e60
line wrap: on
line diff