comparison tests/test-merge6.out @ 7676:43cfbb21f04d

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 21 Jan 2009 14:14:56 -0600
parents 0750f11152fe
children a3d73b3e1f8a
comparison
equal deleted inserted replaced
7674:4d63b10a602e 7676:43cfbb21f04d