diff tests/test-merge-default.out @ 3854:4f6db0233606

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