diff tests/test-merge4.out @ 4346:c593e502f7fd

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Sun, 15 Apr 2007 18:42:38 -0500
parents b2ae81a7df29
children
line wrap: on
line diff