diff tests/test-merge5.out @ 7866:b2c18c795622

Merge with -stable
author Matt Mackall <mpm@selenic.com>
date Fri, 20 Mar 2009 18:55:20 -0500
parents 0b89315d5de2
children 68a1b9d0663e
line wrap: on
line diff