diff tests/test-merge7.out @ 3928:4df475e22248

Sync with -stable
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Dec 2006 21:48:22 -0600
parents b16456909a0a
children 46280c004f22
line wrap: on
line diff