diff tests/test-merge3.out @ 10609:5ee3faa7c563

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Sun, 07 Mar 2010 22:04:35 -0600
parents 91c56c427171
children
line wrap: on
line diff